Bug 1331957 - Part 10: Upgrade cctools used for building Firefox on OS X debug static analysis for support for LC_DATA_IN_CODE sections; r=froydnj
☠☠ backed out by 2a51c94218f2 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 31 Jan 2017 01:35:35 -0500
changeset 470007 f74c7a543525d772ca744c06b5523cda5178cd09
parent 470006 6631f35829200fb92dcd40755ce2d2edb0734168
child 470008 82c98214febe19e2e75ae0552af6f3c932cf3525
push id43899
push userhchang@mozilla.com
push dateFri, 03 Feb 2017 02:45:46 +0000
reviewersfroydnj
bugs1331957
milestone54.0a1
Bug 1331957 - Part 10: Upgrade cctools used for building Firefox on OS X debug static analysis for support for LC_DATA_IN_CODE sections; r=froydnj
browser/config/mozconfigs/macosx64/debug-static-analysis
browser/config/tooltool-manifests/macosx64/clang.manifest
--- a/browser/config/mozconfigs/macosx64/debug-static-analysis
+++ b/browser/config/mozconfigs/macosx64/debug-static-analysis
@@ -1,12 +1,30 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
+# The toolchain installed on our OSX 10.7 build machines is too old to support
+# MachO LC_DATA_IN_CODE load command, which newer LLVM generates, so we need to
+# use a newer toolchain that we build.
+#
+# Unfortunately setting $PATH is not enough, because the build system hardcodes
+# the default values for some of the build tools, which we also need to
+# override below.  The default value for host ar and host ranlib is also
+# hardcoded so we need to override those separately.
+CCTOOLS_DIR="$topsrcdir/cctools/bin"
+export PATH="$CCTOOLS_DIR:$PATH"
+export AR="$CCTOOLS_DIR/ar"
+export HOST_AR="$CCTOOLS_DIR/ar"
+export RANLIB="$CCTOOLS_DIR/ranlib"
+export HOST_RANLIB="$CCTOOLS_DIR/ranlib"
+export LIPO="$CCTOOLS_DIR/lipo"
+export OTOOL="$CCTOOLS_DIR/otool"
+export STRIP="$CCTOOLS_DIR/strip"
+
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 
 ac_add_options --enable-clang-plugin
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/tooltool-manifests/macosx64/clang.manifest
+++ b/browser/config/tooltool-manifests/macosx64/clang.manifest
@@ -20,16 +20,16 @@
 "algorithm": "sha512",
 "visibility": "public",
 "filename": "sccache2.tar.bz2",
 "unpack": true,
 "digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
 "size": 1143715
 },
 {
-"version": "cctools port from commit hash db1f8d906cb28, ld only",
-"size": 634496,
-"digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
+"version": "cctools port from commit hash 84ce22dbb22a26ce7f392e9de0ee39c2efe6fd68",
+"size": 2174783,
+"digest": "8678348faff8f344b377075007975ae77a55a2a73488e36950a43c8ec27a79970cd8e34003e33e756a57d9cbf5c3e2e4461184102c6c03f793377a4d250a7f24",
 "algorithm": "sha512",
 "filename": "cctools.tar.bz2",
 "unpack": true
 }
 ]