Changeset 79788 in webkit
- Timestamp:
- Feb 26, 2011 7:32:59 AM (13 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
-
ChangeLog (modified) (1 diff)
-
gyp/JavaScriptCore.gyp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r79773 r79788 1 2011-02-26 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Dimitri Glazkov. 4 5 JavaScriptCore should use the xcconfig file instead of importing that information into GYP 6 https://bugs.webkit.org/show_bug.cgi?id=55282 7 8 Technically, this breaks the build because I had removed one of the 9 warnings in this config file, but this change seems like an 10 improvement. 11 12 * gyp/JavaScriptCore.gyp: 13 1 14 2011-02-26 Thouraya ANDOLSI <thouraya.andolsi@st.com> 2 15 -
trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
r79646 r79788 35 35 'libobjc.dylib', 36 36 ], 37 'xcode_config_file': '../Configurations/Base.xcconfig', 37 38 'sources/': [ 38 39 ['exclude', 'qt'], … … 78 79 #### From Chromium ##### 79 80 'USE_HEADERMAP': 'NO', 80 81 'DEAD_CODE_STRIPPING': 'YES',82 'DEBUG_INFORMATION_FORMAT': 'dwarf',83 'GCC_C_LANGUAGE_STANDARD': 'gnu99',84 'GCC_DEBUGGING_SYMBOLS': 'default',85 'GCC_DYNAMIC_NO_PIC': 'NO',86 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',87 'GCC_ENABLE_CPP_RTTI': 'NO',88 'GCC_ENABLE_OBJC_EXCEPTIONS': 'YES',89 'GCC_ENABLE_OBJC_GC': 'supported',90 'GCC_ENABLE_SYMBOL_SEPARATION': 'NO',91 'GCC_FAST_OBJC_DISPATCH': 'YES',92 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES',93 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',94 'GCC_MODEL_TUNING': 'G5',95 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES',96 'GCC_STRICT_ALIASING': 'YES',97 'GCC_THREADSAFE_STATICS': 'NO',98 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',99 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'NO',100 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',101 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'NO',102 'GCC_WARN_NON_VIRTUAL_DESTRUCTOR': 'YES',103 'LINKER_DISPLAYS_MANGLED_NAMES': 'YES',104 'PREBINDING': 'NO',105 'VALID_ARCHS': 'i386 ppc x86_64 ppc64',106 'WARNING_CFLAGS': '$(WARNING_CFLAGS_$(CURRENT_ARCH))',107 'WARNING_CFLAGS_BASE': [108 '-Wall',109 '-Wextra',110 '-Wcast-qual',111 '-Wchar-subscripts',112 '-Wextra-tokens',113 '-Wformat=2',114 '-Winit-self',115 # FIXME: Add this warning back.116 # '-Wmissing-format-attribute',117 '-Wmissing-noreturn',118 '-Wpacked',119 '-Wpointer-arith',120 '-Wredundant-decls',121 '-Wundef',122 '-Wwrite-strings',123 ],124 'WARNING_CFLAGS_': '$(WARNING_CFLAGS_BASE) -Wshorten-64-to-32',125 'WARNING_CFLAGS_i386': '$(WARNING_CFLAGS_BASE) -Wshorten-64-to-32',126 'WARNING_CFLAGS_ppc': '$(WARNING_CFLAGS_BASE) -Wshorten-64-to-32',127 # FIXME: JavaScriptGlue 64-bit builds should build with -Wshorten-64-to-32128 'WARNING_CFLAGS_ppc64': '$(WARNING_CFLAGS_BASE)',129 'WARNING_CFLAGS_x86_64': '$(WARNING_CFLAGS_BASE)',130 131 'TARGET_MAC_OS_X_VERSION_MAJOR': '$(MAC_OS_X_VERSION_MAJOR)',132 133 # DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL and STRIP_INSTALLED_PRODUCT vary between the debug and normal variants.134 # We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.135 'DEBUG_DEFINES_debug': '',136 'DEBUG_DEFINES_normal': 'NDEBUG',137 'DEBUG_DEFINES': '$(DEBUG_DEFINES_$(CURRENT_VARIANT))',138 139 'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT))',140 'GCC_OPTIMIZATION_LEVEL_normal': 's',141 'GCC_OPTIMIZATION_LEVEL_debug': '0',142 143 'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT))',144 'STRIP_INSTALLED_PRODUCT_normal': 'YES',145 'STRIP_INSTALLED_PRODUCT_debug': 'NO',146 147 # Use GCC 4.2 with Xcode 3.1, which includes GCC 4.2 but defaults to GCC 4.0.148 # Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version149 # number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and150 # XCODE_VERSION_ACTUAL for the full version number.151 'TARGET_GCC_VERSION': '$(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR))',152 'TARGET_GCC_VERSION_': '$(TARGET_GCC_VERSION_1040)',153 'TARGET_GCC_VERSION_1040': 'GCC_40',154 'TARGET_GCC_VERSION_1050': '$(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR))',155 'TARGET_GCC_VERSION_1050_': '$(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL))',156 'TARGET_GCC_VERSION_1050_0310': 'GCC_42',157 'TARGET_GCC_VERSION_1050_0320': 'GCC_42',158 'TARGET_GCC_VERSION_1060': 'GCC_42',159 'TARGET_GCC_VERSION_1070': 'LLVM_GCC_42',160 161 'GCC_VERSION': '$(GCC_VERSION_$(TARGET_GCC_VERSION))',162 'GCC_VERSION_GCC_40': '4.0',163 'GCC_VERSION_GCC_42': '4.2',164 'GCC_VERSION_LLVM_GCC_42': 'com.apple.compilers.llvmgcc42',165 166 # If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.167 'SDKROOT': '$(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR))',168 'SDKROOT_1050_1040': 'macosx10.4',169 'SDKROOT_1060_1040': 'macosx10.4',170 'SDKROOT_1060_1050': 'macosx10.5',171 'SDKROOT_1070_1040': 'macosx10.4',172 'SDKROOT_1070_1050': 'macosx10.5',173 'SDKROOT_1070_1060': 'macosx10.6',174 81 175 82 ##### From DebugRelease #####
Note: See TracChangeset
for help on using the changeset viewer.
