[tbb-commits] [tor-browser-build/master] macosx-toolchain: remove unused variables

[boklm at torproject.org]

commit 288f5223ca434226cc376f0802a58a974b8e3d4b
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jan 24 12:51:38 2017 +0100

    macosx-toolchain: remove unused variables
    
    macosx-toolchain is currently used in two components: firefox and tor.
    In the firefox build we don't use those (unexported) variables. In the
    tor build we only use CFLAGS and CXXFLAGS through the configure options,
    and we move them to var/FLAGS in rbm.conf.
---
 projects/macosx-toolchain/config | 9 ---------
 rbm.conf                         | 3 ++-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config
index 0bf4575..6458485 100644
--- a/projects/macosx-toolchain/config
+++ b/projects/macosx-toolchain/config
@@ -11,15 +11,6 @@ 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
-    CFLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir"
-    CXXFLAGS="$CFLAGS"
-    CC="$clangdir/helpers/clang $CFLAGS"
-    CXX="$clangdir/helpers/clang++ $CXXFLAGS"
-    RANLIB=$cctoolsdir/x86_64-apple-darwin10-ranlib
-    AR=$cctoolsdir/x86_64-apple-darwin10-ar
-    AS=$cctoolsdir/x86_64-apple-darwin10-as
-    LD=$cctoolsdir/x86_64-apple-darwin10-ld
-    STRIP=$cctoolsdir/x86_64-apple-darwin10-strip
 
 input_files:
   - name: llvm
diff --git a/rbm.conf b/rbm.conf
index cbd725f..05e45a6 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -131,7 +131,8 @@ targets:
       osx: 1
       osname: osx-x86_64
       compiler: 'macosx-toolchain'
-      configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang $CFLAGS" CXX="x86_64-apple-darwin10-clang++ $CXXFLAGS"'
+      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"
       locale_ja: ja-JP-mac
       deps:
         - build-essential