commit 5cf384c54a0dfd3edd44373bb9370e549fcf64f8 Author: Georg Koppen gk@torproject.org Date: Thu May 31 16:10:53 2018 +0000
Bug 26195: Use new cctools for macOS toolchain --- projects/macosx-toolchain/build | 9 +++++---- projects/macosx-toolchain/config | 5 ++--- rbm.conf | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index 94954c5..d1d8c34 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -8,10 +8,11 @@ tar xf [% c('input_files_by_name/llvm') %] mv llvm "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin -ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang -ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ -# "go link" expects to find a program called "dsymutil" exactly. -ln -sf x86_64-apple-darwin10-dsymutil dsymutil +ln -s ../../clang/bin/clang x86_64-apple-darwin11-clang +ln -s ../../clang/bin/clang++ x86_64-apple-darwin11-clang++ +# "go link", libevent, and the jemalloc cross-compilation during the Rust build +# expect to find a program called "dsymutil" exactly. +ln -s ../../clang/bin/llvm-dsymutil dsymutil
cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index ff31abf..8502f57 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 10.7-1 +version: 10.11-1 var: container: use_container: 1 @@ -20,8 +20,7 @@ input_files: - name: llvm project: llvm - name: cctools - URL: https://people.torproject.org/~gk/mirrors/sources/cctools.tar.gz - sha256sum: e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 + project: cctools - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca diff --git a/rbm.conf b/rbm.conf index 19bee8e..9a30353 100644 --- a/rbm.conf +++ b/rbm.conf @@ -240,8 +240,8 @@ targets: suite: jessie arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' - FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + 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" locale_ja: ja-JP-mac # We only build snowflake for linux and osx on the alpha and nightly