diff options
Diffstat (limited to 'JavaScriptCore/Configurations/JavaScriptCore.xcconfig')
| -rw-r--r-- | JavaScriptCore/Configurations/JavaScriptCore.xcconfig | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig index f8d6c2c..69b2491 100644 --- a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig +++ b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig @@ -24,19 +24,22 @@ #include "FeatureDefines.xcconfig" #include "Version.xcconfig" -EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH)); -EXPORTED_SYMBOLS_FILE_ = JavaScriptCore.exp; -EXPORTED_SYMBOLS_FILE_armv6 = JavaScriptCore.exp; -EXPORTED_SYMBOLS_FILE_armv7 = JavaScriptCore.exp; -EXPORTED_SYMBOLS_FILE_i386 = JavaScriptCore.exp; -EXPORTED_SYMBOLS_FILE_ppc = JavaScriptCore.exp; -EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp; -EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp; +JSVALUE_MODEL = $(JSVALUE_MODEL_$(CURRENT_ARCH)); +JSVALUE_MODEL_ = UNKNOWN_JSVALUE_MODEL; +JSVALUE_MODEL_armv6 = 32; +JSVALUE_MODEL_armv7 = 32_64; +JSVALUE_MODEL_i386 = 32_64; +JSVALUE_MODEL_ppc = 32_64; +JSVALUE_MODEL_ppc64 = 32; +JSVALUE_MODEL_x86_64 = 64; + +EXPORTED_SYMBOLS_FILE = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.JSVALUE$(JSVALUE_MODEL).exp; OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3; OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME)); OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE); OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos); -OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices; +OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); +OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction; GCC_PREFIX_HEADER = JavaScriptCorePrefix.h; HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS); INFOPLIST_FILE = Info.plist; @@ -44,8 +47,7 @@ INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks; PRODUCT_NAME = JavaScriptCore; OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT)); -OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL)); -OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL)); -OTHER_CFLAGS_normal_0310 = $(OTHER_CFLAGS_normal_GCC_42); -OTHER_CFLAGS_normal_0320 = $(OTHER_CFLAGS_normal_GCC_42); +OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION)); +OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION)); OTHER_CFLAGS_normal_GCC_42 = -fomit-frame-pointer -funwind-tables; +OTHER_CFLAGS_normal_LLVM_GCC_42 = $(OTHER_CFLAGS_normal_GCC_42); |