diff options
Diffstat (limited to 'build/make/configure.sh')
| -rw-r--r-- | build/make/configure.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index f98018027..c527cd527 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -666,6 +666,10 @@ process_common_toolchain() { tgt_isa=x86_64 tgt_os=darwin13 ;; + *darwin14*) + tgt_isa=x86_64 + tgt_os=darwin14 + ;; x86_64*mingw32*) tgt_os=win64 ;; @@ -775,6 +779,10 @@ process_common_toolchain() { add_cflags "-mmacosx-version-min=10.9" add_ldflags "-mmacosx-version-min=10.9" ;; + *-darwin14-*) + add_cflags "-mmacosx-version-min=10.10" + add_ldflags "-mmacosx-version-min=10.10" + ;; *-iphonesimulator-*) add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}" add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}" @@ -1243,10 +1251,14 @@ EOF fi tgt_os_no_version=$(echo "${tgt_os}" | tr -d "[0-9]") + if [ "${tgt_os_no_version}" = "darwin" ] || \ + [ "${tgt_os_no_version}" = "openbsd" ] || [ "`uname`" = "OpenBSD" ]; then + openbsd_like=yes + fi # Default use_x86inc to yes when we are 64 bit, non-pic, or on any # non-Darwin target. if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \ - [ "${tgt_os_no_version}" != "darwin" ]; then + [ "${openbsd_like}" != "yes" ]; then soft_enable use_x86inc fi |