diff options
| author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2017-11-09 10:45:11 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2017-11-09 10:45:11 +0300 |
| commit | 74fc407eb0a28f7d01895f94815fb467d7f1f8b9 (patch) | |
| tree | 313e2e71a35572cc2f8e33093d94a1018b4fdc1a | |
| parent | 9c81529b0481dc47c485918f54333e88e5eedec4 (diff) | |
| download | jdk8u_hotspot-74fc407eb0a28f7d01895f94815fb467d7f1f8b9.tar.gz | |
JRE-483 JBSDK does not compile with Xcode 9jb8u152-b1172jb8u152-b1171jb8u152-b1170jb8u152-b1169jb8u152-b1167jb8u152-b1166jb8u152-b1165jb8u152-b1164jb8u152-b1163jb8u152-b1162jb8u152-b1161jb8u152-b1160jb8u152-b1157jb8u152-b1156jb8u152-b1154jb8u152-b1153.7jb8u152-b1153.6jb8u152-b1153.5jb8u152-b1153.4jb8u152-b1153.3jb8u152-b1153.2jb8u152-b1153.1jb8u152-b1153jb8u152-b1152jb8u152-b1151jb8u152-b1150jb8u152-b1147jb8u152-b1146jb8u152-b1145jb8u152-b1144jb8u152-b1143jb8u152-b1142jb8u152-b1141jb8u152-b1140jb8u152-b1139jb8u152-b1138jb8u152-b1137jb8u152-b1136.9jb8u152-b1136.8jb8u152-b1136.7jb8u152-b1136.6jb8u152-b1136.5jb8u152-b1136.43jb8u152-b1136.4jb8u152-b1136.39jb8u152-b1136.38jb8u152-b1136.37jb8u152-b1136.36jb8u152-b1136.35jb8u152-b1136.34jb8u152-b1136.33jb8u152-b1136.32jb8u152-b1136.3jb8u152-b1136.29jb8u152-b1136.28jb8u152-b1136.27jb8u152-b1136.26jb8u152-b1136.23jb8u152-b1136.22jb8u152-b1136.21jb8u152-b1136.20jb8u152-b1136.2jb8u152-b1136.19jb8u152-b1136.18jb8u152-b1136.17jb8u152-b1136.16jb8u152-b1136.15jb8u152-b1136.14jb8u152-b1136.13jb8u152-b1136.12jb8u152-b1136.11jb8u152-b1136.10jb8u152-b1136.1jb8u152-b1136jb8u152-b1135jb8u152-b1134jb8u152-b1133jb8u152-b1132jb8u152-b1129jb8u152-b1128jb8u152-b1127jb8u152-b1126jb8u152-b1125jb8u152-b1124jb8u152-b1123jb8u152-b1121jb8u152-b1120jb8u152-b1119.4jb8u152-b1119.3jb8u152-b1119.2jb8u152-b1119.1jb8u152-b1118jb8u152-b1117jb8u152-b1115jb8u152-b1114jb8u152-b1113jb8u152-b1112jb8u152-b1111jb8u152-b1110jb8u152-b1109jb8u152-b1105jb8u152-b1104jb8u152-b1103jb8u152-b1102.3jb8u152-b1102.2jb8u152-b1102jb8u152-b1101jb8u152-b1100jb8u152-b1099jb8u152-b1094jb8u152-b1091jb8u152-b1088jb8u152-b1087jb8u152-b1085jb8u152-b1082jb8u152-b1081jb8u152-b1079jb8u152-b1078jb8u152-b1077jb8u152-b1073jb8u152-b1072jb8u152-b1071jb8u152-b1070jb8u152-b1069jb8u152-b1068jb8u152-b1064jb8u152-b1063jb8u152-b1062jb8u152-b1061
Fixed Xcode 8 build failure with newer (unsupported) options
| -rw-r--r-- | make/bsd/makefiles/gcc.make | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/make/bsd/makefiles/gcc.make b/make/bsd/makefiles/gcc.make index 3d201d294..95761cee7 100644 --- a/make/bsd/makefiles/gcc.make +++ b/make/bsd/makefiles/gcc.make @@ -87,6 +87,7 @@ ifeq ($(OS_VENDOR), Darwin) ifeq ($(DSYMUTIL),) DSYMUTIL=dsymutil endif + XCODE_VER := $(shell xcodebuild -version | head -n1 | sed 's/Xcode //' | cut -d'.' -f1) endif ifeq ($(USE_CLANG), true) @@ -257,7 +258,7 @@ ifeq ($(USE_CLANG), true) # Not yet supported by clang in Xcode 4.6.2 # WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess - WARNINGS_ARE_ERRORS += -Wno-empty-body -Wno-shorten-64-to-32 -Wno-sign-conversion + WARNINGS_ARE_ERRORS += -Wno-empty-body endif WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef @@ -267,7 +268,15 @@ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& # conversions which might affect the values. Only enable it in earlier versions. WARNING_FLAGS = -Wunused-function ifeq ($(USE_CLANG),) - WARNING_FLAGS += -Wno-conversion -Wno-logical-op-parentheses -Wno-tautological-undefined-compare -Wno-shift-negative-value -Wno-switch -Wno-format + ifeq ($(OS_VENDOR), Darwin) + ifeq "$(shell expr $(XCODE_VER) \>= 9 )" "1" + WARNING_FLAGS += -Wno-conversion -Wno-logical-op-parentheses -Wno-tautological-undefined-compare -Wno-shift-negative-value -Wno-switch -Wno-format -Wno-shorten-64-to-32 -Wno-sign-conversion + else + WARNING_FLAGS += -Wconversion + endif + else + WARNING_FLAGS += -Wconversion + endif endif endif |