Skip to content

GitLab

T
tangled
Commit 936eff9d authored by mrowe@apple.com's avatar mrowe@apple.com
Browse files
Options

Bring some consistency to the CompilerVersion.xcconfig files. They all now... 

Bring some consistency to the CompilerVersion.xcconfig files.  They all now include REAL_PLATFORM_NAME in the relevant setting names.

Rubber-stamped by Sam Weinig.

git-svn-id: svn://svn.chromium.org/blink/trunk@93248 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent b816ac63
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 134 deletions
third_party/WebKit/Source/JavaScriptGlue/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -57,8 +57,16 @@ WARNING_CFLAGS_ppc64 = $(WARNING_CFLAGS_BASE);
WARNING_CFLAGS_x86_64 = $(WARNING_CFLAGS_BASE);
HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS);
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL and STRIP_INSTALLED_PRODUCT vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
DEBUG_DEFINES_debug = ;
......
third_party/WebKit/Source/JavaScriptGlue/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -28,29 +28,32 @@ IS_XCODE_0400_0400 = 1;
// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
third_party/WebKit/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -24,6 +24,12 @@ PREBINDING = NO;
STRIP_INSTALLED_PRODUCT = NO;
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
third_party/WebKit/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -28,29 +28,32 @@ IS_XCODE_0400_0400 = 1;
// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
third_party/WebKit/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
View file @ 936eff9d
......@@ -32,7 +32,13 @@ ALWAYS_SEARCH_USER_PATHS = NO
// Turn on position dependent code for most cases (overridden where appropriate)
GCC_DYNAMIC_NO_PIC = YES
TARGET_MAC_OS_X_VERSION_MAJOR=MAC_OS_VERSION_MAJOR
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
// Use GCC 4.2 with Xcode 3.1, which includes GCC 4.2 but defaults to GCC 4.0.
// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
......
third_party/WebKit/Source/WebKit2/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -58,6 +58,8 @@ OTHER_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_sym
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
third_party/WebKit/Source/WebKit2/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -28,29 +28,32 @@ IS_XCODE_0400_0400 = 1;
// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
third_party/WebKit/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -39,6 +39,12 @@ WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
LINKER_DISPLAYS_MANGLED_NAMES = YES;
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
third_party/WebKit/Tools/DumpRenderTree/mac/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -29,29 +29,31 @@ IS_XCODE_0400_0400 = 1;
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
third_party/WebKit/Tools/MiniBrowser/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -36,6 +36,12 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES;
VALID_ARCHS = i386 x86_64;
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
third_party/WebKit/Tools/MiniBrowser/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -28,29 +28,32 @@ IS_XCODE_0400_0400 = 1;
// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
third_party/WebKit/Tools/TestWebKitAPI/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -39,6 +39,12 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES;
VALID_ARCHS = i386 x86_64;
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
third_party/WebKit/Tools/TestWebKitAPI/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -29,29 +29,31 @@ IS_XCODE_0400_0400 = 1;
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
third_party/WebKit/Tools/WebKitTestRunner/Configurations/Base.xcconfig
View file @ 936eff9d
......@@ -39,6 +39,12 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES;
VALID_ARCHS = i386 x86_64;
REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME));
REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx);
REAL_PLATFORM_NAME_iphoneos = iphoneos;
REAL_PLATFORM_NAME_iphonesimulator = iphonesimulator;
REAL_PLATFORM_NAME_macosx = macosx;
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
......
third_party/WebKit/Tools/WebKitTestRunner/Configurations/CompilerVersion.xcconfig
View file @ 936eff9d
......@@ -28,29 +28,32 @@ IS_XCODE_0400_0400 = 1;
// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
// number. Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
// XCODE_VERSION_ACTUAL for the full version number.
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(REAL_PLATFORM_NAME));
TARGET_GCC_VERSION_iphoneos = LLVM_GCC_42;
TARGET_GCC_VERSION_iphonesimulator = GCC_42;
TARGET_GCC_VERSION_macosx = $(TARGET_GCC_VERSION_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_1050_0310 = GCC_42;
TARGET_GCC_VERSION_1050_0320 = GCC_42;
TARGET_GCC_VERSION_macosx_1050 = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_MINOR));
TARGET_GCC_VERSION_macosx_1050_ = $(TARGET_GCC_VERSION_macosx_1050_$(XCODE_VERSION_ACTUAL));
TARGET_GCC_VERSION_macosx_1050_0310 = GCC_42;
TARGET_GCC_VERSION_macosx_1050_0320 = GCC_42;
TARGET_GCC_VERSION_1060 = $(TARGET_GCC_VERSION_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_1060_Debug = $(TARGET_GCC_VERSION_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_1060_Debug_0400 = $(TARGET_GCC_VERSION_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_1060_Release = GCC_42;
TARGET_GCC_VERSION_1060_Production = GCC_42;
TARGET_GCC_VERSION_macosx_1060 = $(TARGET_GCC_VERSION_macosx_1060_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1060_Debug = $(TARGET_GCC_VERSION_macosx_1060_Debug_$(XCODE_VERSION_MAJOR));
TARGET_GCC_VERSION_macosx_1060_Debug_0300 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Debug_0400 = $(TARGET_GCC_VERSION_macosx_1060_Debug_0400_$(IS_XCODE_0400));
TARGET_GCC_VERSION_macosx_1060_Debug_0400_ = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1060_Debug_0400_1 = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Release = GCC_42;
TARGET_GCC_VERSION_macosx_1060_Production = GCC_42;
TARGET_GCC_VERSION_1070 = $(TARGET_GCC_VERSION_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070 = $(TARGET_GCC_VERSION_macosx_1070_$(CONFIGURATION));
TARGET_GCC_VERSION_macosx_1070_Debug = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1070_Release = LLVM_GCC_42;
TARGET_GCC_VERSION_macosx_1070_Production = LLVM_GCC_42;
TARGET_GCC_VERSION_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_1090 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1080 = LLVM_COMPILER;
TARGET_GCC_VERSION_macosx_1090 = LLVM_COMPILER;
GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
GCC_VERSION_GCC_40 = 4.0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment