Changeset 177027 in webkit


Ignore:
Timestamp:
Dec 9, 2014 11:08:43 AM (9 years ago)
Author:
ddkilzer@apple.com
Message:

Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
<​http://webkit.org/b/139212>

Reviewed by Joseph Pecoraro.

Source/bmalloc:

  • Configurations/Base.xcconfig:
  • Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
  • Configurations/DebugRelease.xcconfig:
  • Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig:
  • Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
  • Only set LLVM_LOCAL_HEADER_PATH and LLVM_SYSTEM_HEADER_PATH on OS X.
  • Set JAVASCRIPTCORE_CONTENTS_DIR and JAVASCRIPTCORE_FRAMEWORKS_DIR separately for iOS and OS X.
  • Configurations/DebugRelease.xcconfig:
  • Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
  • Configurations/JSC.xcconfig:
  • Only set CODE_SIGN_ENTITLEMENTS for iOS hardware builds.
  • Configurations/JavaScriptCore.xcconfig:
  • Set OTHER_LDFLAGS separately for iOS and OS X.
  • Set SECTORDER_FLAGS separately for iOS and OS X, but only for Production builds.
  • Only set EXCLUDED_SOURCE_FILE_NAMES for iOS.
  • Configurations/LLVMForJSC.xcconfig:
  • Rename LLVM_LIBS_iphoneos to LLVM_LIBS_ios.
  • Set LLVM_LIBRARY_PATHS and OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT separately for iOS hardware and OS X.
  • Fix curly braces in LIBRARY_SEARCH_PATHS.
  • Merge OTHER_LDFLAGS_BASE into OTHER_LDFLAGS. (Could have been done before this patch.)
  • Configurations/ToolExecutable.xcconfig:
  • Only set CODE_SIGN_ENTITLEMENTS for iOS, per target.
  • Only set CLANG_ENABLE_OBJC_ARC for i386 on the iOS Simulator.
  • Add missing newline.
  • Configurations/Version.xcconfig:
  • Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.

Source/ThirdParty:

  • gtest/xcode/Config/General.xcconfig:
  • Only set SDKROOT and TOOLCHAINS on OS X.

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig:
  • Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
  • Configurations/DebugRelease.xcconfig:
  • Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.

Source/WTF:

  • Configurations/Base.xcconfig:
  • Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS on OS X.
  • Configurations/DebugRelease.xcconfig:
  • Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
Location:
trunk/Source
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r177010 r177027  
     12014-12-09  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
     4        <http://webkit.org/b/139212>
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * Configurations/Base.xcconfig:
     9        - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
     10          on OS X.
     11        - Only set LLVM_LOCAL_HEADER_PATH and LLVM_SYSTEM_HEADER_PATH on
     12          OS X.
     13        - Set JAVASCRIPTCORE_CONTENTS_DIR and
     14          JAVASCRIPTCORE_FRAMEWORKS_DIR separately for iOS and OS X.
     15
     16        * Configurations/DebugRelease.xcconfig:
     17        - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
     18
     19        * Configurations/JSC.xcconfig:
     20        - Only set CODE_SIGN_ENTITLEMENTS for iOS hardware builds.
     21
     22        * Configurations/JavaScriptCore.xcconfig:
     23        - Set OTHER_LDFLAGS separately for iOS and OS X.
     24        - Set SECTORDER_FLAGS separately for iOS and OS X, but only for
     25          Production builds.
     26        - Only set EXCLUDED_SOURCE_FILE_NAMES for iOS.
     27
     28        * Configurations/LLVMForJSC.xcconfig:
     29        - Rename LLVM_LIBS_iphoneos to LLVM_LIBS_ios.
     30        - Set LLVM_LIBRARY_PATHS and OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT
     31          separately for iOS hardware and OS X.
     32        - Fix curly braces in LIBRARY_SEARCH_PATHS.
     33        - Merge OTHER_LDFLAGS_BASE into OTHER_LDFLAGS. (Could have been
     34          done before this patch.)
     35
     36        * Configurations/ToolExecutable.xcconfig:
     37        - Only set CODE_SIGN_ENTITLEMENTS for iOS, per target.
     38        - Only set CLANG_ENABLE_OBJC_ARC for i386 on the iOS Simulator.
     39        - Add missing newline.
     40
     41        * Configurations/Version.xcconfig:
     42        - Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
     43
    1442014-12-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    245

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

    r175397 r177027  
    4848GCC_ENABLE_CPP_RTTI = NO;
    4949GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    50 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    51 GCC_ENABLE_OBJC_GC_iphoneos = NO;
    52 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    53 GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
     50GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    5451GCC_ENABLE_OBJC_GC_macosx_ = NO;
    5552GCC_ENABLE_OBJC_GC_macosx_YES = supported;
    … …  
    5855GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    5956GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
    60 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    61 GCC_MODEL_TUNING_macosx = G5;
     57GCC_MODEL_TUNING[sdk=macosx*] = G5;
    6258GCC_OBJC_CALL_CXX_CDTORS = YES;
    6359GCC_PRECOMPILE_PREFIX_HEADER = YES;
    … …  
    9086WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
    9187
    92 LLVM_LOCAL_HEADER_PATH = $(LLVM_LOCAL_HEADER_PATH_$(PLATFORM_NAME))
    93 LLVM_LOCAL_HEADER_PATH_macosx = "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/include"
    94 LLVM_LOCAL_HEADER_PATH_iphoneos = ;
    95 LLVM_LOCAL_HEADER_PATH_iphonesimulator = ;
     88LLVM_LOCAL_HEADER_PATH[sdk=macosx*] = "$(BUILT_PRODUCTS_DIR)/usr/local/LLVMForJavaScriptCore/include";
    9689
    97 LLVM_SYSTEM_HEADER_PATH = $(LLVM_SYSTEM_HEADER_PATH_$(PLATFORM_NAME))
    98 LLVM_SYSTEM_HEADER_PATH_macosx = /usr/local/LLVMForJavaScriptCore/include;
    99 LLVM_SYSTEM_HEADER_PATH_iphoneos = ;
    100 LLVM_SYSTEM_HEADER_PATH_iphonesimulator = ;
     90LLVM_SYSTEM_HEADER_PATH[sdk=macosx*] = /usr/local/LLVMForJavaScriptCore/include;
    10191
    10292HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" $(LLVM_SYSTEM_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
    … …  
    113103NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
    114104
    115 JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    116 JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
    117 JAVASCRIPTCORE_FRAMEWORKS_DIR_iphonesimulator = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_iphoneos);
    118 
    119 JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
     105JAVASCRIPTCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
     106JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
    120107JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
    121108JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
    122109JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
    123110
    124 JAVASCRIPTCORE_CONTENTS_DIR = $(JAVASCRIPTCORE_CONTENTS_DIR_$(PLATFORM_NAME));
    125 JAVASCRIPTCORE_CONTENTS_DIR_iphoneos = JavaScriptCore.framework;
    126 JAVASCRIPTCORE_CONTENTS_DIR_iphonesimulator = $(JAVASCRIPTCORE_CONTENTS_DIR_iphoneos);
    127 JAVASCRIPTCORE_CONTENTS_DIR_macosx = JavaScriptCore.framework/Versions/A;
     111JAVASCRIPTCORE_CONTENTS_DIR[sdk=iphone*] = JavaScriptCore.framework;
     112JAVASCRIPTCORE_CONTENTS_DIR[sdk=macosx*] = JavaScriptCore.framework/Versions/A;
    128113
    129114JAVASCRIPTCORE_RESOURCES_DIR = $(JAVASCRIPTCORE_CONTENTS_DIR)/Resources;
    … …  
    153138HAVE_DTRACE = 1;
    154139
    155 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
    156 TOOLCHAINS_iphoneos = $(TOOLCHAINS);
    157 TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
    158 TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
     140TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
     141TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
    159142TOOLCHAINS_macosx_1080 = default;
    160143TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

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

    r175397 r177027  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    31 MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    32 MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;
    33 MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     30MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3431MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
    3532MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
    … …  
    4441OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    4542
    46 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
    47 SDKROOT_iphoneos = $(SDKROOT);
    48 SDKROOT_iphonesimulator = $(SDKROOT);
    49 SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
     43SDKROOT[sdk=iphone*] = $(SDKROOT);
     44SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    5045SDKROOT_macosx_ = macosx;
    5146SDKROOT_macosx_YES = macosx.internal;

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

    r164814 r177027  
    2727INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
    2828PRODUCT_NAME = jsc;
    29 CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME));
    30 CODE_SIGN_ENTITLEMENTS_iphoneos = entitlements.plist;
     29CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = entitlements.plist;
    3130
    3231// Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.

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

    r171212 r177027  
    3838
    3939OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
    40 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    41 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
    42 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    43 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
     40OTHER_LDFLAGS[sdk=iphone*] = $(inherited) $(OTHER_LDFLAGS_BASE);
     41OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
    4442
    45 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
    46 SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
    47 SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,JavaScriptCore.order;
     43SECTORDER_FLAGS[sdk=iphone*] = $(SECTORDER_FLAGS_ios_$(CONFIGURATION));
     44SECTORDER_FLAGS_ios_Production = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
     45SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME)_$(CONFIGURATION));
     46SECTORDER_FLAGS_macosx_Production = -Wl,-order_file,JavaScriptCore.order;
    4847
    4948GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    … …  
    5756INSTALLHDRS_SCRIPT_PHASE = YES;
    5857
    59 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    60 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = framework.sb;
    61 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     58EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = framework.sb;

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

    r176326 r177027  
    2828OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-exported_symbol -Wl,_initializeAndGetJSCLLVMAPI -Wl,-all_load;
    2929
    30 LLVM_LIBS_iphoneos = -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMIRReader -lLLVMBitReader -lLLVMAsmParser -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMDebugInfo -lLLVMOption -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCDisassembler -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils;
     30LLVM_LIBS_ios = -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMIRReader -lLLVMBitReader -lLLVMAsmParser -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMDebugInfo -lLLVMOption -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCDisassembler -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils;
    3131LLVM_LIBS_macosx   = -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMIRReader -lLLVMBitReader -lLLVMAsmParser -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMDebugInfo -lLLVMOption -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCDisassembler -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport -lLLVMX86Disassembler     -lLLVMX86CodeGen     -lLLVMX86AsmParser     -lLLVMX86Desc     -lLLVMX86Info     -lLLVMX86AsmPrinter     -lLLVMX86Utils;
    3232
    33 LLVM_LIBRARY_PATHS = $(LLVM_LIBRARY_PATHS_$(PLATFORM_NAME))
    34 LLVM_LIBRARY_PATHS_macosx = "${BUILT_PRODUCTS_DIR}/usr/local/LLVMForJavaScriptCore/lib" /usr/local/LLVMForJavaScriptCore/lib;
    35 LLVM_LIBRARY_PATHS_iphoneos = "${BUILT_PRODUCTS_DIR}/usr/local/lib" /usr/local/lib;
    36 LLVM_LIBRARY_PATHS_iphonesimulator = ;
     33LLVM_LIBRARY_PATHS[sdk=iphoneos*] = "$(BUILT_PRODUCTS_DIR)/usr/local/lib" /usr/local/lib;
     34LLVM_LIBRARY_PATHS[sdk=macosx*] = "$(BUILT_PRODUCTS_DIR)/usr/local/LLVMForJavaScriptCore/lib" /usr/local/LLVMForJavaScriptCore/lib;
    3735
    38 LIBRARY_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR} $(LLVM_LIBRARY_PATHS) $(LIBRARY_SEARCH_PATHS)
     36LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR) $(LLVM_LIBRARY_PATHS) $(LIBRARY_SEARCH_PATHS);
    3937
    4038OTHER_LDFLAGS_LLVM = $(OTHER_LDFLAGS_LLVM_$(ENABLE_FTL_JIT));
    41 OTHER_LDFLAGS_LLVM_ = ;
    42 OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT = -lpthread -lm $(LLVM_LIBS_$(PLATFORM_NAME));
     39OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT[sdk=iphoneos*] = -lpthread -lm $(LLVM_LIBS_ios);
     40OTHER_LDFLAGS_LLVM_ENABLE_FTL_JIT[sdk=macosx*] = -lpthread -lm $(LLVM_LIBS_macosx);
    4341
    44 OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
    45 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    46 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM);
    47 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    48 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_LLVM)
     42OTHER_LDFLAGS = $(inherited) -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS) $(OTHER_LDFLAGS_LLVM);
    4943GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    5044HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);

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

    r164827 r177027  
    2727INSTALL_PATH_ACTUAL = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/$(JAVASCRIPTCORE_RESOURCES_DIR);
    2828PRODUCT_NAME = $(TARGET_NAME);
    29 CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(PLATFORM_NAME)_$(TARGET_NAME));
    30 CODE_SIGN_ENTITLEMENTS_iphoneos_minidom = entitlements.plist;
    31 CODE_SIGN_ENTITLEMENTS_iphoneos_testapi = entitlements.plist;
    32 CODE_SIGN_ENTITLEMENTS_iphoneos_testRegExp = entitlements.plist;
     29CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));
     30CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;
     31CODE_SIGN_ENTITLEMENTS_ios_testapi = entitlements.plist;
     32CODE_SIGN_ENTITLEMENTS_ios_testRegExp = entitlements.plist;
    3333
    3434SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
    … …  
    3939GCC_ENABLE_OBJC_GC = NO;
    4040CLANG_ENABLE_OBJC_ARC = $(CLANG_ENABLE_OBJC_ARC_$(CURRENT_ARCH));
    41 CLANG_ENABLE_OBJC_ARC_i386 = $(CLANG_ENABLE_OBJC_ARC_i386_$(PLATFORM_NAME));
    42 CLANG_ENABLE_OBJC_ARC_i386_iphonesimulator = YES; # For iOS Simulator version 4.0 and greater
     41CLANG_ENABLE_OBJC_ARC_i386[sdk=iphonesimulator*] = YES;
    4342CLANG_ENABLE_OBJC_ARC_x86_64 = YES;
    4443CLANG_ENABLE_OBJC_ARC_armv7 = YES;

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

    r176727 r177027  
    3434
    3535// The system version prefix is based on the current system version.
    36 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
    37 SYSTEM_VERSION_PREFIX_iphoneos = 8;
    38 SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
    39 SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     36SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
     37SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    4038SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
    4139SYSTEM_VERSION_PREFIX_macosx_1090 = 9;

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r175397 r177027  
     12014-12-09  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
     4        <http://webkit.org/b/139212>
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * Configurations/Base.xcconfig:
     9        - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
     10          on OS X.
     11        * Configurations/DebugRelease.xcconfig:
     12        - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
     13
    1142014-10-30  Dana Burkart  <dburkart@apple.com>
    215

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

    r175397 r177027  
    1919GCC_ENABLE_CPP_RTTI = NO;
    2020GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    21 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    22 GCC_ENABLE_OBJC_GC_iphoneos = NO;
    23 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    24 GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
     21GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    2522GCC_ENABLE_OBJC_GC_macosx_ = NO;
    2623GCC_ENABLE_OBJC_GC_macosx_YES = supported;
    … …  
    2825GCC_FAST_OBJC_DISPATCH = YES;
    2926GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
    30 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    31 GCC_MODEL_TUNING_macosx = G5;
     27GCC_MODEL_TUNING[sdk=macosx*] = G5;
    3228GCC_OBJC_CALL_CXX_CDTORS = YES;
    3329GCC_OPTIMIZATION_LEVEL = s;
    … …  
    5753SDKROOT = macosx.internal;
    5854
    59 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
    60 TOOLCHAINS_iphoneos = $(TOOLCHAINS);
    61 TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
    62 TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
     55TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
     56TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
    6357TOOLCHAINS_macosx_1080 = default;
    6458TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

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

    r175397 r177027  
    55ONLY_ACTIVE_ARCH = YES;
    66
    7 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    8 MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
    9 MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
    10 MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
    11 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
     7MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     8MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
     9MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
     10MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
     11MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1212
    1313GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    … …  
    1616OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    1717
    18 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
    19 SDKROOT_iphoneos = $(SDKROOT);
    20 SDKROOT_iphonesimulator = $(SDKROOT);
    21 SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
     18SDKROOT[sdk=iphone*] = $(SDKROOT);
     19SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    2220SDKROOT_macosx_ = macosx;
    2321SDKROOT_macosx_YES = macosx.internal;

  • trunk/Source/ThirdParty/ChangeLog

    r175397 r177027  
     12014-12-09  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
     4        <http://webkit.org/b/139212>
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * gtest/xcode/Config/General.xcconfig:
     9        - Only set SDKROOT and TOOLCHAINS on OS X.
     10
    1112014-10-30  Dana Burkart  <dburkart@apple.com>
    212

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

    r175397 r177027  
    6868OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    6969
    70 TOOLCHAINS = $(TOOLCHAINS_$(MAC_OS_X_VERSION_MAJOR));
    71 TOOLCHAINS_1080 = default;
    72 TOOLCHAINS_1090 = $(TOOLCHAINS);
    73 TOOLCHAINS_101000 = $(TOOLCHAINS_1090);
    74 TOOLCHAINS_101100 = $(TOOLCHAINS_101000);
     70TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
     71TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
     72TOOLCHAINS_macosx_1080 = default;
     73TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
     74TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_1090);
     75TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_101000);
    7576
    76 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
    77 SDKROOT_iphoneos = $(SDKROOT);
    78 SDKROOT_iphonesimulator = $(SDKROOT);
    79 SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
     77SDKROOT[sdk=iphone*] = $(SDKROOT);
     78SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    8079SDKROOT_macosx_ = macosx;
    8180SDKROOT_macosx_YES = macosx.internal;

  • trunk/Source/WTF/ChangeLog

    r177024 r177027  
     12014-12-09  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
     4        <http://webkit.org/b/139212>
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * Configurations/Base.xcconfig:
     9        - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
     10          on OS X.
     11        * Configurations/DebugRelease.xcconfig:
     12        - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
     13
    1142014-12-09  Dean Jackson  <dino@apple.com>
    215

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

    r175397 r177027  
    4848GCC_ENABLE_CPP_RTTI = NO;
    4949GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    50 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    51 GCC_ENABLE_OBJC_GC_iphoneos = NO;
    52 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    53 GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
     50GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    5451GCC_ENABLE_OBJC_GC_macosx_ = NO;
    5552GCC_ENABLE_OBJC_GC_macosx_YES = supported;
    … …  
    5855GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    5956GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
    60 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    61 GCC_MODEL_TUNING_macosx = G5;
     57GCC_MODEL_TUNING[sdk=macosx*] = G5;
    6258GCC_OBJC_CALL_CXX_CDTORS = YES;
    6359GCC_PRECOMPILE_PREFIX_HEADER = YES;
    … …  
    119115SDKROOT = macosx.internal;
    120116
    121 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
    122 TOOLCHAINS_iphoneos = $(TOOLCHAINS);
    123 TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
    124 TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
     117TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
     118TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
    125119TOOLCHAINS_macosx_1080 = default;
    126120TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

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

    r175397 r177027  
    2727ONLY_ACTIVE_ARCH = YES;
    2828
    29 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    30 MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    31 MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;
    32 MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     29MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3330MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
    3431MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
    … …  
    4138OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    4239
    43 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
    44 SDKROOT_iphoneos = $(SDKROOT);
    45 SDKROOT_iphonesimulator = $(SDKROOT);
    46 SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
     40SDKROOT[sdk=iphone*] = $(SDKROOT);
     41SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    4742SDKROOT_macosx_ = macosx;
    4843SDKROOT_macosx_YES = macosx.internal;

  • trunk/Source/bmalloc/ChangeLog

    r175751 r177027  
     12014-12-09  David Kilzer  <ddkilzer@apple.com>
     2
     3        Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, JavaScriptCore, WTF
     4        <http://webkit.org/b/139212>
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * Configurations/Base.xcconfig:
     9        - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
     10          on OS X.
     11        * Configurations/DebugRelease.xcconfig:
     12        - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
     13
    1142014-11-07  Geoffrey Garen  <ggaren@apple.com>
    215

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

    r175397 r177027  
    4646GCC_ENABLE_CPP_RTTI = NO;
    4747GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    48 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
    49 GCC_ENABLE_OBJC_GC_iphoneos = NO;
    50 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
    51 GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
     48GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    5249GCC_ENABLE_OBJC_GC_macosx_ = NO;
    5350GCC_ENABLE_OBJC_GC_macosx_YES = supported;
    … …  
    5653GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    5754GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
    58 GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
    59 GCC_MODEL_TUNING_macosx = G5;
     55GCC_MODEL_TUNING[sdk=macosx*] = G5;
    6056GCC_OBJC_CALL_CXX_CDTORS = YES;
    6157GCC_PRECOMPILE_PREFIX_HEADER = YES;
    … …  
    114110SDKROOT = macosx.internal;
    115111
    116 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
    117 TOOLCHAINS_iphoneos = $(TOOLCHAINS);
    118 TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
    119 TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
     112TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
     113TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
    120114TOOLCHAINS_macosx_1080 = default;
    121115TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);

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

    r175397 r177027  
    2727ONLY_ACTIVE_ARCH = YES;
    2828
    29 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
    30 MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
    31 MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;
    32 MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     29MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3330MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
    3431MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
    … …  
    4138OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    4239
    43 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
    44 SDKROOT_iphoneos = $(SDKROOT);
    45 SDKROOT_iphonesimulator = $(SDKROOT);
    46 SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
     40SDKROOT[sdk=iphone*] = $(SDKROOT);
     41SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    4742SDKROOT_macosx_ = macosx;
    4843SDKROOT_macosx_YES = macosx.internal;
Note: See TracChangeset for help on using the changeset viewer.