[tor-commits] [tor-browser-build/master] macosx-toolchain setup: export LDFLAGS and CC

[boklm at torproject.org]

commit 0bad542a31e3353c29132454342c6d8c5af9c914
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Apr 3 15:54:01 2017 +0200

    macosx-toolchain setup: export LDFLAGS and CC
---
 projects/macosx-toolchain/config | 2 ++
 rbm.conf                         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config
index 6458485..b237e4d 100644
--- a/projects/macosx-toolchain/config
+++ b/projects/macosx-toolchain/config
@@ -11,6 +11,8 @@ var:
     export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin
     export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH"
     export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib
+    export CC="$clangdir/helpers/clang [% c('var/FLAGS') %]"
+    export LDFLAGS="[% c('var/LDFLAGS') %]"
 
 input_files:
   - name: llvm
diff --git a/rbm.conf b/rbm.conf
index e206193..868c30a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -174,6 +174,7 @@ targets:
       compiler: 'macosx-toolchain'
       configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"'
       FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir"
+      LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
       locale_ja: ja-JP-mac
       deps:
         - build-essential