Modified: trunk/Source/_javascript_Core/ChangeLog (111785 => 111786)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-22 23:46:29 UTC (rev 111785)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-22 23:47:50 UTC (rev 111786)
@@ -1,3 +1,11 @@
+2012-03-22 Mark Rowe <mr...@apple.com>
+
+ Fix the build.
+
+ * Configurations/_javascript_Core.xcconfig: Tell the linker to pull in all members from static libraries
+ rather than only those that contain symbols that _javascript_Core itself uses.
+ * _javascript_Core.xcodeproj/project.pbxproj: Remove some bogus settings that crept in to the Xcode project.
+
2012-03-22 Filip Pizlo <fpi...@apple.com>
DFG NodeFlags has some duplicate code and naming issues
Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (111785 => 111786)
--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2012-03-22 23:46:29 UTC (rev 111785)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2012-03-22 23:47:50 UTC (rev 111786)
@@ -34,7 +34,7 @@
JSVALUE_MODEL_x86_64 = 64;
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
-OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv;
+OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-all_load;
OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (111785 => 111786)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2012-03-22 23:46:29 UTC (rev 111785)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2012-03-22 23:47:50 UTC (rev 111786)
@@ -3182,10 +3182,6 @@
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../WebKitBuild/Release\"",
- );
};
name = Debug;
};
@@ -3194,10 +3190,6 @@
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../WebKitBuild/Release\"",
- );
};
name = Release;
};
@@ -3206,10 +3198,6 @@
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
BUILD_VARIANTS = normal;
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../WebKitBuild/Release\"",
- );
};
name = Production;
};
@@ -3371,10 +3359,6 @@
baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* _javascript_Core.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../WebKitBuild/Release\"",
- );
};
name = Profiling;
};
