From 7008b83ac0c9b0df6c88ee6d93b33b6300c6c64b Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 17 Apr 2017 10:36:05 +0900 Subject: [PATCH] Bug 1356927 - Use ar and ranlib from cctools on mac builds. r=gps --HG-- extra : rebase_source : 89275a0930ab6e7629fe05027cfb3ed3e459f800 --- build/macosx/local-mozconfig.common | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/macosx/local-mozconfig.common b/build/macosx/local-mozconfig.common index 30d911615fee..928b50857766 100644 --- a/build/macosx/local-mozconfig.common +++ b/build/macosx/local-mozconfig.common @@ -17,6 +17,8 @@ if [ -d "$topsrcdir/clang" ]; then export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil # Use an updated linker. ldflags="-B$topsrcdir/cctools/bin" + export AR=$topsrcdir/cctools/bin/ar + export RANLIB=$topsrcdir/cctools/bin/ranlib elif [ -d "$topsrcdir/../clang" ]; then # comm-central based build export CC=$topsrcdir/../clang/bin/clang @@ -25,6 +27,8 @@ elif [ -d "$topsrcdir/../clang" ]; then export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil # Use an updated linker. ldflags="-B$topsrcdir/../cctools/bin" + export AR=$topsrcdir/../cctools/bin/ar + export RANLIB=$topsrcdir/../cctools/bin/ranlib fi # Ensure the updated linker doesn't generate things our older build tools