[tbb-commits] [tor-browser-build/master] Bug 31465: Make SDK version explicit in directory

[gk at torproject.org]

commit 859c6e9dd35010047749372791062e47d2464eea
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Aug 20 11:00:41 2019 +0000

    Bug 31465: Make SDK version explicit in directory
---
 projects/firefox/mozconfig-osx-x86_64 | 2 +-
 projects/macosx-toolchain/build       | 2 +-
 projects/macosx-toolchain/config      | 2 +-
 projects/rust/build                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 5d82d12..188bcc9 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -4,7 +4,7 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain
 mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib"
 
 CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools
-CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK
+CROSS_SYSROOT=$TOOLCHAIN_DIR/MacOSX10.11.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-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS"
diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build
index c9cd282..f306302 100644
--- a/projects/macosx-toolchain/build
+++ b/projects/macosx-toolchain/build
@@ -3,7 +3,7 @@
 distdir="/var/tmp/dist/[% project %]"
 mkdir -p "$distdir"
 tar xjf [% c('input_files_by_name/SDK') %]
-mv MacOSX10.11.sdk "$distdir/SDK"
+mv MacOSX10.11.sdk "$distdir/"
 tar xf [% c('input_files_by_name/clang') %]
 mv clang "$distdir/clang"
 tar -C $distdir -xf [% c('input_files_by_name/cctools') %]
diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config
index 57e471f..b7d5a39 100644
--- a/projects/macosx-toolchain/config
+++ b/projects/macosx-toolchain/config
@@ -7,7 +7,7 @@ var:
   setup: |
     mkdir -p /var/tmp/dist
     tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
-    export sysrootdir=/var/tmp/dist/[% project %]/SDK/
+    export sysrootdir=/var/tmp/dist/[% project %]/MacOSX10.11.sdk/
     export clangdir=/var/tmp/dist/[% project %]/clang
     export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin
     export PATH="$clangdir/bin:$cctoolsdir:$PATH"
diff --git a/projects/rust/build b/projects/rust/build
index 592c6ea..9624c2f 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -40,7 +40,7 @@ export PATH="$distdir-rust-old/bin:$PATH"
   cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF'
 #!/bin/sh
 BASEDIR=/var/tmp/dist/macosx-toolchain
-$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@"
+$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@"
 EOF
 
   chmod +x $distdir/helper/x86_64-apple-darwin-clang