Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1331957 - Part 9: Upgrade cctools used for building clang on OS X for ld 264.3.102; r=froydnj

Browse Source
This commit is contained in:
Ehsan Akhgari 2017-01-23 00:26:42 -05:00
parent 238cd15a38
commit 9ae48af89b
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/config/tooltool-manifests/macosx64/cross-clang.manifest
View File

@ -16,12 +16,12 @@
"unpack": true "unpack": true
}, },
{ {
"size": 3008804, "size": 1349196,
"visibility": "public", "visibility": "public",
"digest": "ba6937f14f3d8b26dcb2d39490dee6b0a8afb60f672f5debb71d7b62c1ec52103201b4b1a3d258f945567de531384b36ddb2ce4aa73dc63d72305b11c146847c", "digest": "438a36523a74cbc4a58226647e0501fa64a1b63f32931dc364a75d699df8accb45afdf26f4cb61c6ac7f58be530205acb6da22008bec19603c6f6fda3a12a8cc",
"algorithm": "sha512", "algorithm": "sha512",
"unpack": true, "unpack": true,
"filename": "cctools.tar.gz" "filename": "cctools.tar.xz"
}, },
{ {
"size": 30823112, "size": 30823112,

4
build/build-clang/build-clang.py
View File

@ -259,7 +259,7 @@ def build_one_stage(cc, cxx, asm, ld, ar, ranlib,
"-DCMAKE_MACOSX_RPATH=@executable_path", "-DCMAKE_MACOSX_RPATH=@executable_path",
"-DCMAKE_OSX_ARCHITECTURES=x86_64", "-DCMAKE_OSX_ARCHITECTURES=x86_64",
"-DDARWIN_osx_ARCHS=x86_64", "-DDARWIN_osx_ARCHS=x86_64",
"-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin10"] "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin11"]
build_package(build_dir, cmake_args) build_package(build_dir, cmake_args)
if is_linux(): if is_linux():
@ -559,7 +559,7 @@ if __name__ == "__main__":
extra_cxxflags = ["-stdlib=libc++"] extra_cxxflags = ["-stdlib=libc++"]
extra_cxxflags2 = ["-stdlib=libc++"] extra_cxxflags2 = ["-stdlib=libc++"]
extra_flags = ["-target", "x86_64-apple-darwin10", "-mlinker-version=136", extra_flags = ["-target", "x86_64-apple-darwin11", "-mlinker-version=137",
"-B", "%s/bin" % os.getenv("CROSS_CCTOOLS_PATH"), "-B", "%s/bin" % os.getenv("CROSS_CCTOOLS_PATH"),
"-isysroot", os.getenv("CROSS_SYSROOT"), "-isysroot", os.getenv("CROSS_SYSROOT"),
# technically the sysroot flag there should be enough to deduce this, # technically the sysroot flag there should be enough to deduce this,

4
build/build-clang/clang-static-analysis-macosx64.json
View File

@ -15,8 +15,8 @@
"cc": "/home/worker/workspace/build/src/clang/bin/clang", "cc": "/home/worker/workspace/build/src/clang/bin/clang",
"cxx": "/home/worker/workspace/build/src/clang/bin/clang++", "cxx": "/home/worker/workspace/build/src/clang/bin/clang++",
"as": "/home/worker/workspace/build/src/clang/bin/clang", "as": "/home/worker/workspace/build/src/clang/bin/clang",
"ar": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin10-ar", "ar": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
"ranlib": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin10-ranlib", "ranlib": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
"ld": "/home/worker/workspace/build/src/clang/bin/clang", "ld": "/home/worker/workspace/build/src/clang/bin/clang",
"patches": { "patches": {
"macosx64": [ "macosx64": [

4
build/build-clang/clang-tidy-macosx64.json
View File

@ -17,8 +17,8 @@
"cc": "/home/worker/workspace/build/src/clang/bin/clang", "cc": "/home/worker/workspace/build/src/clang/bin/clang",
"cxx": "/home/worker/workspace/build/src/clang/bin/clang++", "cxx": "/home/worker/workspace/build/src/clang/bin/clang++",
"as": "/home/worker/workspace/build/src/clang/bin/clang", "as": "/home/worker/workspace/build/src/clang/bin/clang",
"ar": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin10-ar", "ar": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ar",
"ranlib": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin10-ranlib", "ranlib": "/home/worker/workspace/build/src/cctools/bin/x86_64-apple-darwin11-ranlib",
"ld": "/home/worker/workspace/build/src/clang/bin/clang", "ld": "/home/worker/workspace/build/src/clang/bin/clang",
"patches": { "patches": {
"macosx64": [ "macosx64": [

4
build/build-clang/compiler-rt-cross-compile.patch
View File

@ -1,4 +1,4 @@
Add `-target x86_64-apple-darwin10' to the compiler-rt overridden CFLAGS Add `-target x86_64-apple-darwin11' to the compiler-rt overridden CFLAGS
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
index 28d398672..aac68bf36 100644 index 28d398672..aac68bf36 100644
@ -9,7 +9,7 @@ index 28d398672..aac68bf36 100644
set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes) set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes)
- set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer") - set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer")
+ set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-apple-darwin10 -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include") + set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-apple-darwin11 -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
set(CMAKE_C_FLAGS "") set(CMAKE_C_FLAGS "")
set(CMAKE_CXX_FLAGS "") set(CMAKE_CXX_FLAGS "")
set(CMAKE_ASM_FLAGS "") set(CMAKE_ASM_FLAGS "")

2
taskcluster/scripts/misc/build-clang-macosx.sh
View File

@ -18,7 +18,7 @@ export LD_LIBRARY_PATH=$HOME_DIR/src/clang/lib
export CROSS_CCTOOLS_PATH=$HOME_DIR/src/cctools export CROSS_CCTOOLS_PATH=$HOME_DIR/src/cctools
export CROSS_SYSROOT=$HOME_DIR/src/MacOSX10.10.sdk export CROSS_SYSROOT=$HOME_DIR/src/MacOSX10.10.sdk
# cmake doesn't allow us to specify a path to lipo on the command line. # cmake doesn't allow us to specify a path to lipo on the command line.
ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10-lipo /usr/bin/lipo ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo /usr/bin/lipo
# gets a bit too verbose here # gets a bit too verbose here
set +x set +x

2
taskcluster/scripts/misc/build-clang-tidy-macosx.sh
View File

@ -18,7 +18,7 @@ export LD_LIBRARY_PATH=$HOME_DIR/src/clang/lib
export CROSS_CCTOOLS_PATH=$HOME_DIR/src/cctools export CROSS_CCTOOLS_PATH=$HOME_DIR/src/cctools
export CROSS_SYSROOT=$HOME_DIR/src/MacOSX10.10.sdk export CROSS_SYSROOT=$HOME_DIR/src/MacOSX10.10.sdk
# cmake doesn't allow us to specify a path to lipo on the command line. # cmake doesn't allow us to specify a path to lipo on the command line.
ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10-lipo /usr/bin/lipo ln -sf $CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-lipo /usr/bin/lipo
# gets a bit too verbose here # gets a bit too verbose here
set +x set +x