When configuring with --enable-external-build the .mk files are not expected to work. This avoids some spurious warnings when configuring for darwin targets on other platforms.
Unified · Split
| @@ -1081,60 +1081,62 @@ EOF · 1080 unmodified lines | |||
| 1081 | ;; | 1081 | ;; |
| 1082 | 1082 | ||
| 1083 | darwin*) | 1083 | darwin*) |
| 1084 | XCRUN_FIND="xcrun --sdk iphoneos --find" | 1084 | if disabled external_build; then |
| 1085 | CXX="$(${XCRUN_FIND} clang++)" | 1085 | XCRUN_FIND="xcrun --sdk iphoneos --find" |
| 1086 | CC="$(${XCRUN_FIND} clang)" | 1086 | CXX="$(${XCRUN_FIND} clang++)" |
| 1087 | AR="$(${XCRUN_FIND} ar)" | 1087 | CC="$(${XCRUN_FIND} clang)" |
| 1088 | AS="$(${XCRUN_FIND} as)" | 1088 | AR="$(${XCRUN_FIND} ar)" |
| 1089 | STRIP="$(${XCRUN_FIND} strip)" | 1089 | AS="$(${XCRUN_FIND} as)" |
| 1090 | NM="$(${XCRUN_FIND} nm)" | 1090 | STRIP="$(${XCRUN_FIND} strip)" |
| 1091 | RANLIB="$(${XCRUN_FIND} ranlib)" | 1091 | NM="$(${XCRUN_FIND} nm)" |
| 1092 | AS_SFX=.S | 1092 | RANLIB="$(${XCRUN_FIND} ranlib)" |
| 1093 | LD="${CXX:-$(${XCRUN_FIND} ld)}" | 1093 | AS_SFX=.S |
| 1094 | 1094 | LD="${CXX:-$(${XCRUN_FIND} ld)}" | |
| 1095 | # ASFLAGS is written here instead of using check_add_asflags | ||
| 1096 | # because we need to overwrite all of ASFLAGS and purge the | ||
| 1097 | # options that were put in above | ||
| 1098 | ASFLAGS="-arch ${tgt_isa} -g" | ||
| 1099 | |||
| 1100 | add_cflags -arch ${tgt_isa} | ||
| 1101 | add_ldflags -arch ${tgt_isa} | ||
| 1102 | |||
| 1103 | alt_libc="$(show_darwin_sdk_path iphoneos)" | ||
| 1104 | if [ -d "${alt_libc}" ]; then | ||
| 1105 | add_cflags -isysroot ${alt_libc} | ||
| 1106 | fi | ||
| 1107 | 1095 | ||
| 1108 | if [ "${LD}" = "${CXX}" ]; then | 1096 | # ASFLAGS is written here instead of using check_add_asflags |
| 1109 | add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}" | 1097 | # because we need to overwrite all of ASFLAGS and purge the |
| 1110 | else | 1098 | # options that were put in above |
| 1111 | add_ldflags -ios_version_min "${IOS_VERSION_MIN}" | 1099 | ASFLAGS="-arch ${tgt_isa} -g" |
| 1112 | fi | 1100 | |
| 1101 | add_cflags -arch ${tgt_isa} | ||
| 1102 | add_ldflags -arch ${tgt_isa} | ||
| 1103 | |||
| 1104 | alt_libc="$(show_darwin_sdk_path iphoneos)" | ||
| 1105 | if [ -d "${alt_libc}" ]; then | ||
| 1106 | add_cflags -isysroot ${alt_libc} | ||
| 1107 | fi | ||
| 1113 | 1108 | ||
| 1114 | for d in lib usr/lib usr/lib/system; do | 1109 | if [ "${LD}" = "${CXX}" ]; then |
| 1115 | try_dir="${alt_libc}/${d}" | 1110 | add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}" |
| 1116 | [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}" | 1111 | else |
| 1117 | done | 1112 | add_ldflags -ios_version_min "${IOS_VERSION_MIN}" |
| 1118 | 1113 | fi | |
| 1119 | case ${tgt_isa} in | 1114 | |
| 1120 | armv7|armv7s|armv8|arm64) | 1115 | for d in lib usr/lib usr/lib/system; do |
| 1121 | if enabled neon && ! check_xcode_minimum_version; then | 1116 | try_dir="${alt_libc}/${d}" |
| 1122 | soft_disable neon | 1117 | [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}" |
| 1123 | log_echo " neon disabled: upgrade Xcode (need v6.3+)." | 1118 | done |
| 1124 | if enabled neon_asm; then | 1119 | |
| 1125 | soft_disable neon_asm | 1120 | case ${tgt_isa} in |
| 1126 | log_echo " neon_asm disabled: upgrade Xcode (need v6.3+)." | 1121 | armv7|armv7s|armv8|arm64) |
| 1122 | if enabled neon && ! check_xcode_minimum_version; then | ||
| 1123 | soft_disable neon | ||
| 1124 | log_echo " neon disabled: upgrade Xcode (need v6.3+)." | ||
| 1125 | if enabled neon_asm; then | ||
| 1126 | soft_disable neon_asm | ||
| 1127 | log_echo " neon_asm disabled: upgrade Xcode (need v6.3+)." | ||
| 1128 | fi | ||
| 1127 | fi | 1129 | fi |
| 1128 | fi | 1130 | ;; |
| 1129 | ;; | 1131 | esac |
| 1130 | esac | ||
| 1131 | 1132 | ||
| 1132 | asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl" | 1133 | asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl" |
| 1133 | 1134 | ||
| 1134 | if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then | 1135 | if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then |
| 1135 | check_add_cflags -fembed-bitcode | 1136 | check_add_cflags -fembed-bitcode |
| 1136 | check_add_asflags -fembed-bitcode | 1137 | check_add_asflags -fembed-bitcode |
| 1137 | check_add_ldflags -fembed-bitcode | 1138 | check_add_ldflags -fembed-bitcode |
| 1139 | fi | ||
| 1138 | fi | 1140 | fi |
| 1139 | ;; | 1141 | ;; |
| 1140 | 1142 | ||