Changeset 177746 in webkit


Ignore:
Timestamp:
Dec 26, 2014, 7:45:44 AM (10 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
​https://bugs.webkit.org/show_bug.cgi?id=139950

Reviewed by David Kilzer.

Source/bmalloc:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/ThirdParty:

  • gtest/xcode/Config/General.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/WebCore:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/WebInspectorUI:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/WebKit/mac:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/WebKit2:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Source/WTF:

  • Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Tools:

  • asan/asan.xcconfig: Only define TOOLCHAINS when building for OS X, doing so

in a manner that works with Xcode 5.1.1.

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r177675 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-22  Mark Lam  <mark.lam@apple.com>
    212

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r177027 r177746  
    138138HAVE_DTRACE = 1;
    139139
    140 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    141 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     140TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     141TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    142142TOOLCHAINS_macosx_1080 = default;
    143143TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r177724 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-24  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r177724 r177746  
    5353SDKROOT = macosx.internal;
    5454
    55 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    56 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     55TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     56TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    5757TOOLCHAINS_macosx_1080 = default;
    5858TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/ThirdParty/ChangeLog

    r177027 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * gtest/xcode/Config/General.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-09  David Kilzer  <ddkilzer@apple.com>
    212

  • trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig

    r177027 r177746  
    6868OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    6969
    70 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    71 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     70TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     71TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    7272TOOLCHAINS_macosx_1080 = default;
    7373TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/WTF/ChangeLog

    r177740 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-25  Dan Bernstein  <mitz@apple.com>
    212

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

    r177027 r177746  
    115115SDKROOT = macosx.internal;
    116116
    117 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    118 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     117TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     118TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    119119TOOLCHAINS_macosx_1080 = default;
    120120TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/WebCore/ChangeLog

    r177745 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-25  Dhi Aurrahman  <diorahman@rockybars.com>
    212

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

    r177621 r177746  
    112112SDKROOT = macosx.internal;
    113113
    114 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    115 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     114TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     115TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    116116TOOLCHAINS_macosx_1080 = default;
    117117TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/WebInspectorUI/ChangeLog

    r177621 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-20  David Kilzer  <ddkilzer@apple.com>
    212

  • trunk/Source/WebInspectorUI/Configurations/Base.xcconfig

    r177621 r177746  
    6161OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
    6262
    63 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    64 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     63TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     64TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    6565TOOLCHAINS_macosx_1080 = default;
    6666TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/WebKit/mac/ChangeLog

    r177705 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-23  Timothy Horton  <timothy_horton@apple.com>
    212

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r177621 r177746  
    103103SUPPORTED_PLATFORMS = iphonesimulator iphoneos macosx;
    104104
    105 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    106 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     105TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     106TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    107107TOOLCHAINS_macosx_1080 = default;
    108108TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/WebKit2/ChangeLog

    r177743 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-25  Hunseop Jeong  <hs85.jeong@samsung.com>
    212

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

    r177621 r177746  
    106106CODE_SIGN_IDENTITY = -;
    107107
    108 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    109 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     108TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     109TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    110110TOOLCHAINS_macosx_1080 = default;
    111111TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Source/bmalloc/ChangeLog

    r177317 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-15  Geoffrey Garen  <ggaren@apple.com>
    212

  • trunk/Source/bmalloc/Configurations/Base.xcconfig

    r177027 r177746  
    110110SDKROOT = macosx.internal;
    111111
    112 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    113 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     112TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     113TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    114114TOOLCHAINS_macosx_1080 = default;
    115115TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

  • trunk/Tools/ChangeLog

    r177731 r177746  
     12014-12-26  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
     4        https://bugs.webkit.org/show_bug.cgi?id=139950
     5
     6        Reviewed by David Kilzer.
     7
     8        * asan/asan.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
     9        in a manner that works with Xcode 5.1.1.
     10
    1112014-12-24  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Tools/asan/asan.xcconfig

    r177718 r177746  
    1 TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
    2 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     1TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
     2TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
    33TOOLCHAINS_macosx_1080 = default;
    44TOOLCHAINS_macosx_1090 = default;
Note: See TracChangeset for help on using the changeset viewer.