commit 92aa4276c02c1619a9cf70d317c46092ef3ba7c0 Author: Georg Koppen gk@torproject.org Date: Fri Jun 1 20:18:12 2018 +0000

Bug 26003: Clean up our mozconfig-osx-x86_64 file --- projects/firefox/mozconfig-osx-x86_64 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 9ac3ac8..1e30084 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -1,24 +1,21 @@ +TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain + # ld needs libLTO.so from llvm -mk_add_options "export LD_LIBRARY_PATH=/var/tmp/dist/macosx-toolchain/clang/lib" +mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib"

-TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" +FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS"

export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" export CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- -#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically -export AR=${TOOLCHAIN_PREFIX}ar -export RANLIB=${TOOLCHAIN_PREFIX}ranlib -export STRIP=${TOOLCHAIN_PREFIX}strip -export OTOOL=${TOOLCHAIN_PREFIX}otool +export BINDGEN_CFLAGS="$FLAGS" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11- export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil"

export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang"