<https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.

Reviewed by Alexey Proskuryakov.

Source/JavaScriptCore:

* Configurations/Base.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:

Source/WebCore:

* Configurations/Base.xcconfig:

Source/WebKit/mac:

* Configurations/Base.xcconfig:

Source/WebKit2:

* Configurations/Base.xcconfig:

Source/WTF:

* Configurations/Base.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index e2c74fb389b9e1d185bdc6c054cc36c2f72e49b1..a137fc6dda21e90591a04c12d7c830c2574c4b12 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+
 2013-11-21  Michael Saboff  <msaboff@apple.com>
 
         ARM64: Implement push/pop equivalents in LLInt

diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig
index 3a1140659d9840a1edcc91be92f266b40938b0ba..a60a4aef33c67a84fbf24fb3fa102f8db9d360ee 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
@@ -42,10 +42,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR));
-GCC_ENABLE_OBJC_GC_macosx_1080 = supported;
-GCC_ENABLE_OBJC_GC_macosx_1090 = supported;
-GCC_ENABLE_OBJC_GC_macosx_101000 = NO;
+GCC_ENABLE_OBJC_GC_macosx = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index e70db07589a9074195aed9b3e16e6f023c78c6aa..c3b19edd5aa208d7c78b8a6d7c4989b558f50d9d 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+
 2013-11-21  Brent Fulgham  <bfulgham@apple.com>
 
         Unreviewed gardening to hide annoying *.user files when.

diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
index 3c52d228334c43c131026c195eab18294ba9ccc5..18484c1623c73a4561bb7c0271b226c4dbadeec3 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
@@ -15,10 +15,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR));
-GCC_ENABLE_OBJC_GC_macosx_1080 = supported;
-GCC_ENABLE_OBJC_GC_macosx_1090 = supported;
-GCC_ENABLE_OBJC_GC_macosx_101000 = NO;
+GCC_ENABLE_OBJC_GC_macosx = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_INLINES_ARE_PRIVATE_EXTERN = YES;

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 2063147b42d5c916ad5b89a16c144913235300a4..3b03ced57bc1dd8e912afeb9b58dae06c8e7bd45 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+
 2013-11-20  Mark Lam  <mark.lam@apple.com>
 
         Introducing VMEntryScope to update the VM stack limit.

diff --git a/Source/WTF/Configurations/Base.xcconfig b/Source/WTF/Configurations/Base.xcconfig
index 30192b0a53707389f03dfb727eb57c0856b658f8..e9e31121af362d7eefa6c3d80445c9a2eaea650a 100644 (file)
--- a/Source/WTF/Configurations/Base.xcconfig
+++ b/Source/WTF/Configurations/Base.xcconfig
@@ -42,10 +42,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR));
-GCC_ENABLE_OBJC_GC_macosx_1080 = supported;
-GCC_ENABLE_OBJC_GC_macosx_1090 = supported;
-GCC_ENABLE_OBJC_GC_macosx_101000 = NO;
+GCC_ENABLE_OBJC_GC_macosx = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4bacd73d25e244d640b294b9b3e45ccf95fc0a68..51ce506ccc828921266e69d511d61df9f9835b3e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+
 2013-11-21  Mark Rowe  <mrowe@apple.com>
 
         <https://webkit.org/b/124700> Fix some deprecation warnings.

diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig
index be5e63878b721a3dda41a9acc69695028d34e273..e3100e498157a218a0a2d41da32f8e8ff72d9a6c 100644 (file)
--- a/Source/WebCore/Configurations/Base.xcconfig
+++ b/Source/WebCore/Configurations/Base.xcconfig
@@ -40,10 +40,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR));
-GCC_ENABLE_OBJC_GC_macosx_1080 = supported;
-GCC_ENABLE_OBJC_GC_macosx_1090 = supported;
-GCC_ENABLE_OBJC_GC_macosx_101000 = NO;
+GCC_ENABLE_OBJC_GC_macosx = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 22a62bf3325abbc3e470a18b6badb62737c00561..0231a0f14feda473648d926c65c23e4aae2491f1 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+
 2013-11-21  Mark Rowe  <mrowe@apple.com>
 
         <https://webkit.org/b/124700> Fix some deprecation warnings.

diff --git a/Source/WebKit/mac/Configurations/Base.xcconfig b/Source/WebKit/mac/Configurations/Base.xcconfig
index c8d995e81e8b182d99296ade62ce92711359d5bb..2f66fab8c4e54011f30b572bebdee3b662ac826c 100644 (file)
--- a/Source/WebKit/mac/Configurations/Base.xcconfig
+++ b/Source/WebKit/mac/Configurations/Base.xcconfig
@@ -40,10 +40,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(MAC_OS_X_VERSION_MAJOR));
-GCC_ENABLE_OBJC_GC_macosx_1080 = supported;
-GCC_ENABLE_OBJC_GC_macosx_1090 = supported;
-GCC_ENABLE_OBJC_GC_macosx_101000 = NO;
+GCC_ENABLE_OBJC_GC_macosx = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index f03127d051ae0ef5ad2194676dc5529c4695efef..e7f13404492c63ece53a24b2be135dd9ccac014e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Mark Rowe  <mrowe@apple.com>
+
+        <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+
 2013-11-21  Mark Rowe  <mrowe@apple.com>
 
         <https://webkit.org/b/124700> Fix some deprecation warnings.

diff --git a/Source/WebKit2/Configurations/Base.xcconfig b/Source/WebKit2/Configurations/Base.xcconfig
index 04d25e15c23cd9492118334651fc2e8ff7421973..fea1accf46ce8e56cc480cc027986c5c1b238c3e 100644 (file)
--- a/Source/WebKit2/Configurations/Base.xcconfig
+++ b/Source/WebKit2/Configurations/Base.xcconfig
@@ -37,10 +37,7 @@ GCC_DYNAMIC_NO_PIC = NO;
 GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(MAC_OS_X_VERSION_MAJOR));
-GCC_ENABLE_OBJC_GC_1080 = supported;
-GCC_ENABLE_OBJC_GC_1090 = supported;
-GCC_ENABLE_OBJC_GC_101000 = NO;
+GCC_ENABLE_OBJC_GC = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;