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

Bug 1331957 - Part 5: Add `-target x86_64-apple-darwin10' to the compiler-rt overridden CFLAGS; r=froydnj

Browse Source
This commit is contained in:
Ehsan Akhgari 2017-01-19 22:57:02 -05:00
parent 3faecaeefd
commit 792b5995ec
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,14 +21,17 @@
"patches": { "patches": {
"macosx64": [ "macosx64": [
"llvm-debug-frame.patch", "llvm-debug-frame.patch",
"compiler-rt-cross-compile.patch",
"pr28831-r280042.patch" "pr28831-r280042.patch"
], ],
"linux64": [ "linux64": [
"llvm-debug-frame.patch", "llvm-debug-frame.patch",
"compiler-rt-cross-compile.patch",
"pr28831-r280042.patch" "pr28831-r280042.patch"
], ],
"linux32": [ "linux32": [
"llvm-debug-frame.patch", "llvm-debug-frame.patch",
"compiler-rt-cross-compile.patch",
"pr28831-r280042.patch" "pr28831-r280042.patch"
] ]
} }

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

@ -19,5 +19,19 @@
"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-darwin10-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-darwin10-ranlib",
"ld": "/home/worker/workspace/build/src/clang/bin/clang" "ld": "/home/worker/workspace/build/src/clang/bin/clang",
"patches": {
"macosx64": [
"llvm-debug-frame.patch",
"compiler-rt-cross-compile.patch"
],
"linux64": [
"llvm-debug-frame.patch",
"compiler-rt-cross-compile.patch"
],
"linux32": [
"llvm-debug-frame.patch",
"compiler-rt-cross-compile.patch"
]
}
} }

15
build/build-clang/compiler-rt-cross-compile.patch Normal file
View File

@ -0,0 +1,15 @@
Add `-target x86_64-apple-darwin10' to the compiler-rt overridden CFLAGS
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
index 28d398672..aac68bf36 100644
--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -265,7 +265,7 @@ endfunction()
macro(darwin_add_builtin_libraries)
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 -target x86_64-apple-darwin10 -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
set(CMAKE_C_FLAGS "")
set(CMAKE_CXX_FLAGS "")
set(CMAKE_ASM_FLAGS "")