[tor-commits] [tor-browser-build/master] fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET

[gk at torproject.org]

commit 7a01c99641fcdc88a94c94dccb2698fbb7d82bee
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Aug 21 20:15:29 2019 +0200

    fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET
---
 projects/go-webrtc/config | 6 +++---
 projects/rust/build       | 4 ++--
 projects/snowflake/build  | 6 +++---
 projects/webrtc/build     | 4 ++--
 rbm.conf                  | 1 +
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config
index ba1e801..fcf6e89 100644
--- a/projects/go-webrtc/config
+++ b/projects/go-webrtc/config
@@ -27,9 +27,9 @@ var:
     [% END -%]
     [% IF c("var/osx") -%]
       export CGO_ENABLED=1
-      export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7"
-      export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
-      export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"
+      export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
+      export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
+      export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
       export CC="$clangdir/bin/clang"
       export CXX="$clangdir/bin/clang++"
     [% END -%]
diff --git a/projects/rust/build b/projects/rust/build
index 9624c2f..5cf8c02 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -20,12 +20,12 @@ export PATH="$distdir-rust-old/bin:$PATH"
   # Target 10.9 as our toolchain does. Without this explicit declaration Bad
   # Things will happen, as a lot of dependent code then assumes that the
   # official macOS target, x86_64-apple-darwin, essentially means 10.4.
-  export MACOSX_DEPLOYMENT_TARGET=10.9
+  export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %]
   # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built
   # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused
   # that way. Changing the Rust target to x86_64-apple-darwin11 would require a
   # fair amount of patching, thus we create symlinks to provide Rust with the
-  # necessary tools while using our toolchain underneath, targeting 10.7.
+  # necessary tools while using our toolchain underneath, targeting 10.9.
   cd $cctoolsdir
   for f in `ls x86_64-apple-darwin11-*`; do
     ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin}
diff --git a/projects/snowflake/build b/projects/snowflake/build
index ae0ebea..6534329 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -16,9 +16,9 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p $PTDIR $DOCSDIR
 [% IF c("var/osx") %]
   export CGO_ENABLED=1
-  export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.9"
-  export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9"
-  export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9"
+  export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
+  export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
+  export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
   export CC="$clangdir/bin/clang"
   export CXX="$clangdir/bin/clang++"
 [% END %]
diff --git a/projects/webrtc/build b/projects/webrtc/build
index e84a0b1..77d4026 100644
--- a/projects/webrtc/build
+++ b/projects/webrtc/build
@@ -66,7 +66,7 @@ print("$sysrootdir")
 print("10.11")
 EOF
   cat <<EOF > build/config/mac/sdk_info.py
-print("machine_os_build=\"10.9\"")
+print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"")
 print("sdk_build=\"10.11\"")
 print("sdk_path=\"$sysrootdir\"")
 print("sdk_platform_path=\"$sysrootdir\"")
@@ -115,7 +115,7 @@ GN_ARGS+=" use_custom_libcxx=false"
   #GN_ARGS+=" rtc_include_tests=false"
 [% END -%]
 [% IF c("var/osx") -%]
-  GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.9\""
+  GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\""
   GN_ARGS+=" clang_use_chrome_plugins=false"
   GN_ARGS+=" clang_base_path=\"$clangdir\""
   # No lld in our toolchain currently.
diff --git a/rbm.conf b/rbm.conf
index d6c0926..c7c3320 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -334,6 +334,7 @@ targets:
       configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"'
       FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"
       LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
+      macosx_deployment_target: '10.9'
       locale_ja: ja-JP-mac
       # We only build snowflake for linux and macOS on the alpha and nightly
       # channels for now.