Bug 1338008 - Avoid creating a lipo symlink in /usr/bin for clang macosx builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 09 Feb 2017 10:40:16 +0900
changeset 388361 7c98923fd2b6978a899fba812e68585027c0c360
parent 388360 3f812edf11941f09dddcd603706cb2808c0e8cf7
child 388362 14f22ecd79f84dbb7c71caa6b6bb50b4b18d9238
push id7198
push userjlorenzo@mozilla.com
push dateTue, 18 Apr 2017 12:07:49 +0000
treeherdermozilla-beta@d57aa49c3948 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1338008
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1338008 - Avoid creating a lipo symlink in /usr/bin for clang macosx builds. r=mshal
taskcluster/scripts/misc/build-clang-macosx.sh
taskcluster/scripts/misc/build-clang-tidy-macosx.sh
--- a/taskcluster/scripts/misc/build-clang-macosx.sh
+++ b/taskcluster/scripts/misc/build-clang-macosx.sh
@@ -13,17 +13,18 @@ TOOLTOOL_MANIFEST=browser/config/tooltoo
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # ld needs libLTO.so from llvm
 export LD_LIBRARY_PATH=$HOME_DIR/src/clang/lib
 # these variables are used in build-clang.py
 export CROSS_CCTOOLS_PATH=$HOME_DIR/src/cctools
 export CROSS_SYSROOT=$HOME_DIR/src/MacOSX10.10.sdk
 # cmake doesn't allow us to specify a path to lipo on the command line.
-ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo /usr/bin/lipo
+export PATH=$PATH:$CROSS_CCTOOLS_PATH/bin
+ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo $CROSS_CCTOOLS_PATH/bin/lipo
 
 # gets a bit too verbose here
 set +x
 
 cd build/build-clang
 # |mach python| sets up a virtualenv for us!
 ../../mach python ./build-clang.py -c clang-static-analysis-macosx64.json
 
--- a/taskcluster/scripts/misc/build-clang-tidy-macosx.sh
+++ b/taskcluster/scripts/misc/build-clang-tidy-macosx.sh
@@ -13,17 +13,18 @@ TOOLTOOL_MANIFEST=browser/config/tooltoo
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # ld needs libLTO.so from llvm
 export LD_LIBRARY_PATH=$HOME_DIR/src/clang/lib
 # these variables are used in build-clang.py
 export CROSS_CCTOOLS_PATH=$HOME_DIR/src/cctools
 export CROSS_SYSROOT=$HOME_DIR/src/MacOSX10.10.sdk
 # cmake doesn't allow us to specify a path to lipo on the command line.
-ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo /usr/bin/lipo
+export PATH=$PATH:$CROSS_CCTOOLS_PATH/bin
+ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo $CROSS_CCTOOLS_PATH/bin/lipo
 
 # gets a bit too verbose here
 set +x
 
 cd build/build-clang
 # |mach python| sets up a virtualenv for us!
 ../../mach python ./build-clang.py -c clang-tidy-macosx64.json