[tbb-commits] [tor-browser-build/master] Bug 24632: Adapt tor and OpenSSL for new macOS toolchain

[boklm at torproject.org]

commit 3b5038d90cac5cfcf6856cc0786cfa99adbc775a
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jun 4 06:03:09 2018 +0000

    Bug 24632: Adapt tor and OpenSSL for new macOS toolchain
---
 projects/openssl/build  | 2 +-
 projects/openssl/config | 2 +-
 projects/tor/build      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/openssl/build b/projects/openssl/build
index 3851346..a3ff092 100644
--- a/projects/openssl/build
+++ b/projects/openssl/build
@@ -10,7 +10,7 @@ export CC='gcc -m32'
 [% END %]
 [% IF c("var/osx") -%]
   # Tricking OpenSSL into using our clang as cross-compiler
-  ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin10-cc
+  ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc
   export CC="cc [% c("var/FLAGS") %]"
 [% END -%]
 ./Configure --prefix=$distdir [% c('var/configure_opts') %]
diff --git a/projects/openssl/config b/projects/openssl/config
index 3489d42..fe1c5fa 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -19,7 +19,7 @@ targets:
       configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"'
   osx-x86_64:
     var:
-      configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128
+      configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128
 
 input_files:
   - project: container-image
diff --git a/projects/tor/build b/projects/tor/build
index c6d9895..3f845ea 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -88,7 +88,7 @@ cp $distdir/share/tor/geoip6 $TORCONFIGDIR
   cd $distdir
   cp bin/tor $TORBINDIR/
   cd $TORBINDIR/
-  x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor
+  x86_64-apple-darwin11-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor
 [% END %]
 
 cd $distdir