Changeset 214718 in webkit


Ignore:
Timestamp:
Apr 1, 2017, 3:57:47 PM (9 years ago)
Author:
mitz@apple.com
Message:

[Xcode] In engineering builds, linker warns about libwebrtc.dylib’s install name being invalid
​https://bugs.webkit.org/show_bug.cgi?id=170385

Reviewed by Tim Horton.

Source/WebCore:

  • Configurations/DebugRelease.xcconfig: Set WK_RELOCATABLE_FRAMEWORKS to YES like we do in some other projects’ DebugRelease.xcconfig. Engineering builds are always relocatable.
  • Configurations/WebCore.xcconfig: When WebCore is relocatable, tell the linker that it’s not going to be in the shared cache, even if its install name implies that it might be.

Source/WebKit2:

  • Configurations/WebKit.xcconfig: When WebKit is relocatable, tell the linker that it’s not going to be in the shared cache, even if its install name implies that it might be.
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r214713 r214718  
     12017-04-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] In engineering builds, linker warns about libwebrtc.dylib’s install name being invalid
     4        https://bugs.webkit.org/show_bug.cgi?id=170385
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/DebugRelease.xcconfig: Set WK_RELOCATABLE_FRAMEWORKS to YES like we do
     9          in some other projects’ DebugRelease.xcconfig. Engineering builds are always relocatable.
     10        * Configurations/WebCore.xcconfig: When WebCore is relocatable, tell the linker that it’s
     11          not going to be in the shared cache, even if its install name implies that it might be.
     12
    1132017-04-01  Alexey Proskuryakov  <ap@apple.com>
    214

  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r211338 r214718  
    4242SDKROOT_ = macosx;
    4343SDKROOT_YES = macosx.internal;
     44
     45WK_RELOCATABLE_FRAMEWORKS = YES;

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r213541 r214718  
    7878LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    7979
    80 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM)
     80OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
    8181OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE -framework Metal;
    8282OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework MobileCoreServices -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
    … …  
    132132WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
    133133
     134WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
     135WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
     136
    134137// Enable InstallAPI support, when built with WEBCORE_ENABLE_INSTALLAPI=YES.
    135138SUPPORTS_TEXT_BASED_API = $(SUPPORTS_TEXT_BASED_API_$(TARGET_NAME))

  • trunk/Source/WebKit2/ChangeLog

    r214701 r214718  
     12017-04-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] In engineering builds, linker warns about libwebrtc.dylib’s install name being invalid
     4        https://bugs.webkit.org/show_bug.cgi?id=170385
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/WebKit.xcconfig: When WebKit is relocatable, tell the linker that it’s
     9          not going to be in the shared cache, even if its install name implies that it might be.
     10
    1112017-03-31  Simon Fraser  <simon.fraser@apple.com>
    212

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r213504 r214718  
    5656LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
    5757
    58 OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy;
     58OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -framework WebKitLegacy;
    5959OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(LIBWEBRTC_LDFLAGS);
    6060OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = -lAccessibility $(LIBWEBRTC_LDFLAGS);
    … …  
    8181WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos9*] = YES;
    8282WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator9*] = YES;
     83
     84WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
     85WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
Note: See TracChangeset for help on using the changeset viewer.