Changeset 111786 in webkit


Ignore:
Timestamp:
Mar 22, 2012 4:47:50 PM (12 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r111781 r111786  
     12012-03-22  Mark Rowe  <mrowe@apple.com>
     2
     3        Fix the build.
     4
     5        * Configurations/JavaScriptCore.xcconfig: Tell the linker to pull in all members from static libraries
     6        rather than only those that contain symbols that JavaScriptCore itself uses.
     7        * JavaScriptCore.xcodeproj/project.pbxproj: Remove some bogus settings that crept in to the Xcode project.
     8
    192012-03-22  Filip Pizlo  <fpizlo@apple.com>
    210
  • trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r110327 r111786  
    3535
    3636// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
    37 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;
     37OTHER_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;
    3838OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
    3939OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME));
  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r111778 r111786  
    31833183                        buildSettings = {
    31843184                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
    3185                                 LIBRARY_SEARCH_PATHS = (
    3186                                         "$(inherited)",
    3187                                         "\"$(SRCROOT)/../../WebKitBuild/Release\"",
    3188                                 );
    31893185                        };
    31903186                        name = Debug;
     
    31953191                        buildSettings = {
    31963192                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
    3197                                 LIBRARY_SEARCH_PATHS = (
    3198                                         "$(inherited)",
    3199                                         "\"$(SRCROOT)/../../WebKitBuild/Release\"",
    3200                                 );
    32013193                        };
    32023194                        name = Release;
     
    32073199                        buildSettings = {
    32083200                                BUILD_VARIANTS = normal;
    3209                                 LIBRARY_SEARCH_PATHS = (
    3210                                         "$(inherited)",
    3211                                         "\"$(SRCROOT)/../../WebKitBuild/Release\"",
    3212                                 );
    32133201                        };
    32143202                        name = Production;
     
    33723360                        buildSettings = {
    33733361                                INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
    3374                                 LIBRARY_SEARCH_PATHS = (
    3375                                         "$(inherited)",
    3376                                         "\"$(SRCROOT)/../../WebKitBuild/Release\"",
    3377                                 );
    33783362                        };
    33793363                        name = Profiling;
Note: See TracChangeset for help on using the changeset viewer.