Changeset 111786 in webkit

Timestamp:

Mar 22, 2012, 4:47:50 PM (13 years ago)

Author:

mrowe@apple.com

Message:

Fix the build.

• Configurations/JavaScriptCore.xcconfig: Tell the linker to pull in all members from static libraries

rather than only those that contain symbols that JavaScriptCore itself uses.

• JavaScriptCore.xcodeproj/project.pbxproj: Remove some bogus settings that crept in to the Xcode project.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/JavaScriptCore.xcconfig (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-03-22  Mark Rowe  <mrowe@apple.com>
+
+        Fix the build.
+
+        * Configurations/JavaScriptCore.xcconfig: Tell the linker to pull in all members from static libraries
+        rather than only those that contain symbols that JavaScriptCore itself uses.
+        * JavaScriptCore.xcodeproj/project.pbxproj: Remove some bogus settings that crept in to the Xcode project.
+
 2012-03-22  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

@@ -35 +35 @@
 
 // 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));

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -3183 +3183 @@
                         buildSettings = {
                                 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                                LIBRARY_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "\"$(SRCROOT)/../../WebKitBuild/Release\"",
-                                );
                         };
                         name = Debug;
@@ -3195 +3191 @@
                         buildSettings = {
                                 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                                LIBRARY_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "\"$(SRCROOT)/../../WebKitBuild/Release\"",
-                                );
                         };
                         name = Release;
@@ -3207 +3199 @@
                         buildSettings = {
                                 BUILD_VARIANTS = normal;
-                                LIBRARY_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "\"$(SRCROOT)/../../WebKitBuild/Release\"",
-                                );
                         };
                         name = Production;
@@ -3372 +3360 @@
                         buildSettings = {
                                 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
-                                LIBRARY_SEARCH_PATHS = (
-                                        "$(inherited)",
-                                        "\"$(SRCROOT)/../../WebKitBuild/Release\"",
-                                );
                         };
                         name = Profiling;