From 607fa026aa512ddd1af916922d860406ac54a0c5 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Mon, 14 Jan 2019 15:22:12 -0500
Subject: [PATCH] Update get-clang.sh

[skip ci]
---
 src/get-clang.sh | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/get-clang.sh b/src/get-clang.sh
index c1c3252f5d..1d3396f743 100755
--- a/src/get-clang.sh
+++ b/src/get-clang.sh
@@ -19,14 +19,14 @@ case "$ARCH" in
 esac
 if [ ! -d third_party/llvm-build/Release+Asserts/bin ]; then
   mkdir -p third_party/llvm-build/Release+Asserts
-  curl "$clang_url" -o- | tar xzf - -C third_party/llvm-build/Release+Asserts
+  curl "$clang_url" | tar xzf - -C third_party/llvm-build/Release+Asserts
 fi
 
 # AFDO profile (Linux)
 if [ "$ARCH" = Linux -a ! -f chrome/android/profiles/afdo.prof ]; then
   AFDO_PATH=$(cat chrome/android/profiles/newest.txt)
   afdo_url="https://storage.googleapis.com/chromeos-prebuilt/afdo-job/llvm/$AFDO_PATH"
-  curl "$afdo_url" -o- | bzip2 -cd >chrome/android/profiles/afdo.prof
+  curl "$afdo_url" | bzip2 -cd >chrome/android/profiles/afdo.prof
 fi
 
 # sccache (Windows)
@@ -43,25 +43,12 @@ fi
 
 # gn
 if [ ! -f gn/out/gn ]; then
-  if [ "$CI" -o "$ARCH" = Windows ]; then
-    mkdir -p gn/out
-    cd gn/out
-    case "$ARCH" in
-      Linux) curl -L https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/latest -o gn.zip;;
-      Darwin) curl -L https://chrome-infra-packages.appspot.com/dl/gn/gn/mac-amd64/+/latest -o gn.zip;;
-      Windows) curl -L https://chrome-infra-packages.appspot.com/dl/gn/gn/windows-amd64/+/latest -o gn.zip;;
-    esac
-    unzip gn.zip
-  else
-    rm -rf gn
-    git clone --single-branch https://gn.googlesource.com/gn
-    export PATH="$PWD/third_party/llvm-build/Release+Asserts/bin:$PATH"
-    cd gn
-    if which ccache >/dev/null 2>&1; then
-      export CC='ccache clang' CXX='ccache clang++' CCACHE_BASEDIR="$PWD"
-    fi
-    python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-    $python2 build/gen.py
-    ninja -C out gn
-  fi
+  mkdir -p gn/out
+  cd gn/out
+  case "$ARCH" in
+    Linux) curl -L https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/latest -o gn.zip;;
+    Darwin) curl -L https://chrome-infra-packages.appspot.com/dl/gn/gn/mac-amd64/+/latest -o gn.zip;;
+    Windows) curl -L https://chrome-infra-packages.appspot.com/dl/gn/gn/windows-amd64/+/latest -o gn.zip;;
+  esac
+  unzip gn.zip
 fi