Changeset 167049 in webkit


Ignore:
Timestamp:
Apr 9, 2014 4:16:55 PM (10 years ago)
Author:
ggaren@apple.com
Message:

Rolled back in r166972.

This time, we conditionally exclude linking against bmalloc in Production
builds. Production builds will not be able to link against bmalloc
until the Production build system has been updated to build bmalloc.

WTF should link against bmalloc
​https://bugs.webkit.org/show_bug.cgi?id=131403

Reviewed by Mark Rowe.

  • Configurations/WTF.xcconfig:
  • WTF.xcodeproj/project.pbxproj:
Location:
trunk/Source/WTF
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r167048 r167049  
     12014-04-09  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Rolled back in r166972.
     4
     5        This time, we conditionally exclude linking against bmalloc in Production
     6        builds. Production builds will not be able to link against bmalloc
     7        until the Production build system has been updated to build bmalloc.
     8
     9            WTF should link against bmalloc
     10            https://bugs.webkit.org/show_bug.cgi?id=131403
     11
     12            Reviewed by Mark Rowe.
     13
     14            * Configurations/WTF.xcconfig:
     15            * WTF.xcodeproj/project.pbxproj:
     16
    1172014-04-09  Geoffrey Garen  <ggaren@apple.com>
    218

  • trunk/Source/WTF/Configurations/WTF.xcconfig

    r141308 r167049  
    2727
    2828GCC_SYMBOLS_PRIVATE_EXTERN = YES;
     29
     30EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
     31EXCLUDED_SOURCE_FILE_NAMES_Production = libbmalloc.a;

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r167035 r167049  
    4141                0FDDBFA71666DFA300C55FEF /* StringPrintStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDDBFA51666DFA300C55FEF /* StringPrintStream.cpp */; };
    4242                0FDDBFA81666DFA300C55FEF /* StringPrintStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDDBFA61666DFA300C55FEF /* StringPrintStream.h */; };
     43                14022F4118F5C3FC007FF0EB /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14022F4018F5C3FC007FF0EB /* libbmalloc.a */; };
    4344                143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 143F611D1565F0F900DB514A /* RAMSize.cpp */; };
    4445                143F61201565F0F900DB514A /* RAMSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 143F611E1565F0F900DB514A /* RAMSize.h */; settings = {ATTRIBUTES = (); }; };
    … …  
    310311                0FDDBFA61666DFA300C55FEF /* StringPrintStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringPrintStream.h; sourceTree = "<group>"; };
    311312                0FEC3EE4171B834700FDAC8D /* ByteSpinLock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ByteSpinLock.h; sourceTree = "<group>"; };
     313                14022F4018F5C3FC007FF0EB /* libbmalloc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbmalloc.a; path = libbmalloc.a; sourceTree = BUILT_PRODUCTS_DIR; };
    312314                143F611D1565F0F900DB514A /* RAMSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RAMSize.cpp; sourceTree = "<group>"; };
    313315                143F611E1565F0F900DB514A /* RAMSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAMSize.h; sourceTree = "<group>"; };
    … …  
    562564                        buildActionMask = 2147483647;
    563565                        files = (
     566                                14022F4118F5C3FC007FF0EB /* libbmalloc.a in Frameworks */,
    564567                        );
    565568                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    568571
    569572/* Begin PBXGroup section */
     573                14022F3F18F5C3E5007FF0EB /* Libraries */ = {
     574                        isa = PBXGroup;
     575                        children = (
     576                                14022F4018F5C3FC007FF0EB /* libbmalloc.a */,
     577                        );
     578                        name = Libraries;
     579                        sourceTree = "<group>";
     580                };
    570581                1FA47C87152502DA00568D1B /* ios */ = {
    571582                        isa = PBXGroup;
    … …  
    589600                        children = (
    590601                                5D247B6D14689C4700E78B76 /* Configurations */,
     602                                14022F3F18F5C3E5007FF0EB /* Libraries */,
    591603                                5D247B6314689B8600E78B76 /* Products */,
    592604                                5D247B7614689D7600E78B76 /* Source */,
Note: See TracChangeset for help on using the changeset viewer.