summarylogtreecommitdiffstats
path: root/ignore-clang50-install.patch
diff options
context:
space:
mode:
authorZerophase2018-11-09 01:23:44 -0600
committerZerophase2018-11-09 01:23:59 -0600
commit79168ec16e945253cf46fd4653580c4f807d6666 (patch)
tree2527349519745f6abb86eacdc8a3fc37be9291e3 /ignore-clang50-install.patch
parent2a7406a82e9b8c92697fb22eae9b3c59652faafd (diff)
downloadaur-79168ec16e945253cf46fd4653580c4f807d6666.tar.gz
Update to 4.21.0
Diffstat (limited to 'ignore-clang50-install.patch')
-rw-r--r--ignore-clang50-install.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/ignore-clang50-install.patch b/ignore-clang50-install.patch
index acffdfc286c..6edcf7d55b5 100644
--- a/ignore-clang50-install.patch
+++ b/ignore-clang50-install.patch
@@ -1,11 +1,11 @@
---- Setup.sh 2018-07-20 11:21:40.054921036 -0500
-+++ Setup_new.sh 2018-07-20 11:25:08.190071301 -0500
-@@ -126,7 +126,7 @@
+--- Setup.sh 2018-11-07 22:50:22.997048687 -0600
++++ Setup_new.sh 2018-11-07 23:04:31.947012499 -0600
+@@ -41,7 +41,7 @@
fi
- # Install our bundled toolchain unless we are running a Perforce build
--if [ ! -f Build/PerforceBuild.txt ]; then
-+if [ ! -f Build/PerforceBuild.txt ] && [[ "$ID" != "arch" ]]; then
+ # Install our bundled toolchain unless we are running a Perforce build or a an our of source toolchain is available.
+-if [ ! -f Build/PerforceBuild.txt ] && [ -z "$LINUX_MULTIARCH_ROOT" ] && [ -z "$UE_SDKS_ROOT" ]; then
++if [ ! -f Build/PerforceBuild.txt ] && [["$ID" != "arch" ]] && [ -z "$LINUX_MULTIARCH_ROOT" ] && [ -z "$UE_SDKS_ROOT" ]; then
echo "Installing a bundled clang toolchain"
pushd Build/BatchFiles/Linux > /dev/null
./SetupToolchain.sh