Part 2 of 2: <http://webkit.org/b/56337> Enable -Werror on ANGLE

[WebKit-https.git] / Source / ThirdParty / ANGLE / Configurations / CompilerVersion.xcconfig

diff --git a/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig b/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
index d72c34d08b8aaff98ce61d6a7506544bc72990b4..cb7e89d0115bd4508b0ff8eb2a91a84bb90f81fa 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/CompilerVersion.xcconfig
@@ -28,31 +28,26 @@ 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.
 // 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_$(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_macosx_ = $(TARGET_GCC_VERSION_macosx_1040);
-TARGET_GCC_VERSION_macosx_1040 = GCC_40;
+TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));

 
 

-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_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_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_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_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_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;

 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;
 
 GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
 GCC_VERSION_GCC_40 = 4.0;