[mq]: linker-fix draft
authoraleth <aleth@instantbird.org>
Wed, 03 Aug 2016 23:46:43 +0200
changeset 38711 b311b005efe6a8a8ec0bcfe812e4babeda76f7e8
parent 38703 21dbdc8b7a403660bdcf277fb44665c9897420a4
child 38712 2535a0ec68fba9271acdfc74c9cdbae7fb5932f2
child 38713 4563985faf916e458f787765b33234f892d3b452
push id3515
push useraleth@instantbird.org
push dateWed, 03 Aug 2016 21:48:53 +0000
treeherdertry-comm-central@2535a0ec68fb [default view] [failures only]
[mq]: linker-fix
build/macosx/local-mozconfig.common
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -11,26 +11,28 @@ fi
 . "$topsrcdir/build/mozconfig.common"
 
 if [ -d "$topsrcdir/clang" ]; then
     # mozilla-central based build
     export CC=$topsrcdir/clang/bin/clang
     export CXX=$topsrcdir/clang/bin/clang++
     export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
     export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
+    # Use an updated linker.
+    ldflags="-B$topsrcdir/cctools/bin"
 elif [ -d "$topsrcdir/../clang" ]; then
     # comm-central based build
     export CC=$topsrcdir/../clang/bin/clang
     export CXX=$topsrcdir/../clang/bin/clang++
     export LLVMCONFIG=$topsrcdir/../clang/bin/llvm-config
     export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil
+    # Use an updated linker.
+    ldflags="-B$topsrcdir/../cctools/bin"
 fi
 
-# Use an updated linker.
-ldflags="-B$topsrcdir/cctools/bin"
 # Ensure the updated linker doesn't generate things our older build tools
 # don't understand.
 ldflags="$ldflags -Wl,-no_data_in_code_info"
 export LDFLAGS="$ldflags"
 
 # If not set use the system default clang
 if [ -z "$CC" ]; then
     export CC=clang