Unverified Commit 288f5223 authored by boklm's avatar boklm
Browse files

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.
parent 0159ed07
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment