Finally a real build fix.

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

diff --git a/JavaScriptCore/Configurations/Base.xcconfig b/JavaScriptCore/Configurations/Base.xcconfig
index 1618bb031a3e726db8a968511c0bcd255323dad4..3187201f83d1454454ed645864d515189f6f9d07 100644 (file)
--- a/JavaScriptCore/Configurations/Base.xcconfig
+++ b/JavaScriptCore/Configurations/Base.xcconfig
@@ -9,6 +9,7 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = YES;
+GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 GCC_MODEL_TUNING = G5;

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 266e86195c12de933656013178673678bcf2ed52..a98d4b568548bcb35047d070e1082fe881d7af91 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -1354,13 +1354,11 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                932F5BE30822A1C700736975 /* All */,
                                932F5B3E0822A1C700736975 /* JavaScriptCore */,
@@ -1660,6 +1658,7 @@
                        baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = "";
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                        };
                        name = Debug;
                };
@@ -1668,6 +1667,7 @@
                        baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                        };
                        name = Release;
                };

diff --git a/JavaScriptGlue/Configurations/Base.xcconfig b/JavaScriptGlue/Configurations/Base.xcconfig
index 1618bb031a3e726db8a968511c0bcd255323dad4..3187201f83d1454454ed645864d515189f6f9d07 100644 (file)
--- a/JavaScriptGlue/Configurations/Base.xcconfig
+++ b/JavaScriptGlue/Configurations/Base.xcconfig
@@ -9,6 +9,7 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = YES;
+GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 GCC_MODEL_TUNING = G5;

diff --git a/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj b/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
index f51163ec36f77f6a078409b330a0da24c640a8a6..89eaed47a4ac8331c2ce426bea097ac81509b510 100644 (file)
--- a/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
+++ b/JavaScriptGlue/JavaScriptGlue.xcodeproj/project.pbxproj
@@ -286,13 +286,11 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 14AC662B08CE7791006915A8 /* Build configuration list for PBXProject "JavaScriptGlue" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptGlue */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                1422E8C409DE3EA600749B87 /* All */,
                                DD66F3B908F73ED700C75FD7 /* JavaScriptGlue */,
@@ -475,6 +473,7 @@
                        baseConfigurationReference = 1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = "";
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                        };
                        name = Debug;
                };
@@ -483,6 +482,7 @@
                        baseConfigurationReference = 1C9051A10BA9F3050081E9D0 /* JavaScriptGlue.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                        };
                        name = Release;
                };

diff --git a/WebCore/Configurations/Base.xcconfig b/WebCore/Configurations/Base.xcconfig
index 21d1e0f9be02eb9cc998d55e6674e24db4970c91..4b2b77f77dc5e009f92f594e6092e55156b6e4e1 100644 (file)
--- a/WebCore/Configurations/Base.xcconfig
+++ b/WebCore/Configurations/Base.xcconfig
@@ -7,6 +7,7 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = YES;
+GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 GCC_MODEL_TUNING = G5;

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 667b0d9613a6a35b733105bccb07583e99c77dac..d216a2ab5900148c6754bd1d360595c2d04fc82d 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -11245,7 +11245,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -11260,7 +11259,6 @@
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                93F198A508245E59001E9ABC /* WebCore */,
                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
@@ -12598,7 +12596,9 @@
                        baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = DISABLE_THREAD_CHECK;
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
+                                       "-lobjc",
                                        "-sub_library",
                                        libobjc,
                                );
@@ -12610,7 +12610,9 @@
                        baseConfigurationReference = 1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
+                                       "-lobjc",
                                        "-sub_library",
                                        libobjc,
                                );
@@ -12623,6 +12625,7 @@
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
                                OTHER_LDFLAGS = (
+                                       "-lobjc",
                                        "-sub_library",
                                        libobjc,
                                        "-umbrella",

diff --git a/WebKit/Configurations/Base.xcconfig b/WebKit/Configurations/Base.xcconfig
index 21d1e0f9be02eb9cc998d55e6674e24db4970c91..4b2b77f77dc5e009f92f594e6092e55156b6e4e1 100644 (file)
--- a/WebKit/Configurations/Base.xcconfig
+++ b/WebKit/Configurations/Base.xcconfig
@@ -7,6 +7,7 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO;
 GCC_ENABLE_CPP_RTTI = NO;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 GCC_ENABLE_OBJC_GC = YES;
+GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 GCC_MODEL_TUNING = G5;

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 230bcccb03a836390f6c4b5b73ba1bfe0d6e7458..c20d5945b5b583afee5efef28da684d6c4f18d14 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1296,7 +1296,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -1311,7 +1310,6 @@
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
                        projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );
@@ -1556,6 +1554,7 @@
                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = DISABLE_THREAD_CHECK;
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
                                        "-lobjc",
                                        "-sub_library",
@@ -1570,6 +1569,7 @@
                        baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit.xcconfig */;
                        buildSettings = {
                                DEBUG_DEFINES = NDEBUG;
+                               INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
                                OTHER_LDFLAGS = (
                                        "-lobjc",
                                        "-sub_library",