зеркало из https://github.com/mozilla/gecko-dev.git
Bug 768406 - Upgrade clang to r159219. r=rail.
Update the build scripts.
This commit is contained in:
Родитель
be3b0761b1
Коммит
db3416b87e
|
@ -3,7 +3,7 @@
|
|||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
llvm_revision = "158160"
|
||||
llvm_revision = "159219"
|
||||
moz_version = "moz0"
|
||||
|
||||
##############################################
|
||||
|
@ -96,10 +96,7 @@ if not os.path.exists(source_dir):
|
|||
compiler_rt_source_dir, llvm_revision)
|
||||
os.symlink("../../clang", llvm_source_dir + "/tools/clang")
|
||||
os.symlink("../../compiler-rt", llvm_source_dir + "/projects/compiler-rt")
|
||||
if isDarwin:
|
||||
patch("clang-no-ios.patch", 0, clang_source_dir)
|
||||
patch("compiler-rt-no-ios.patch", 0, compiler_rt_source_dir)
|
||||
else:
|
||||
if not isDarwin:
|
||||
patch("old-ld-hack.patch", 1, llvm_source_dir)
|
||||
patch("compiler-rt-gnu89-inline.patch", 0, compiler_rt_source_dir)
|
||||
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
Index: runtime/compiler-rt/Makefile
|
||||
===================================================================
|
||||
--- runtime/compiler-rt/Makefile (revision 157958)
|
||||
+++ runtime/compiler-rt/Makefile (working copy)
|
||||
@@ -74,8 +74,8 @@
|
||||
ifeq ($(OS),Darwin)
|
||||
RuntimeDirs += darwin
|
||||
RuntimeLibrary.darwin.Configs := \
|
||||
- eprintf 10.4 osx ios cc_kext \
|
||||
- asan_osx profile_osx profile_ios
|
||||
+ eprintf 10.4 osx \
|
||||
+ asan_osx profile_osx
|
||||
endif
|
||||
|
||||
# On Linux, include a library which has all the runtime functions.
|
|
@ -1,29 +0,0 @@
|
|||
Index: make/platform/clang_darwin.mk
|
||||
===================================================================
|
||||
--- make/platform/clang_darwin.mk (revision 157958)
|
||||
+++ make/platform/clang_darwin.mk (working copy)
|
||||
@@ -47,7 +47,7 @@
|
||||
# Configuration for targetting iOS, for some ARMv6 functions, which must be
|
||||
# in the same linkage unit, and for a couple of other functions that didn't
|
||||
# make it into libSystem.
|
||||
-Configs += ios
|
||||
+#Configs += ios
|
||||
UniversalArchs.ios := $(call CheckArches,i386 x86_64 armv6 armv7,ios)
|
||||
|
||||
# Configuration for targetting OSX. These functions may not be in libSystem
|
||||
@@ -56,13 +56,13 @@
|
||||
UniversalArchs.osx := $(call CheckArches,i386 x86_64,osx)
|
||||
|
||||
# Configuration for use with kernel/kexts.
|
||||
-Configs += cc_kext
|
||||
+#Configs += cc_kext
|
||||
UniversalArchs.cc_kext := $(call CheckArches,armv6 armv7 i386 x86_64,cc_kext)
|
||||
|
||||
# Configurations which define the profiling support functions.
|
||||
Configs += profile_osx
|
||||
UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
|
||||
-Configs += profile_ios
|
||||
+#Configs += profile_ios
|
||||
UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv6 armv7,profile_ios)
|
||||
|
||||
# Configurations which define the ASAN support functions.
|
Загрузка…
Ссылка в новой задаче