diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-20 22:53:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-20 22:53:45 +0200 |
| commit | 6c6e0149e0bc9607f4d3e601915e77d6646bc809 (patch) | |
| tree | 0b7ea4b554479c0bbbfe515c1de5daebee0144cc | |
| parent | 939436f03d46f39a6bb761c1e04f5fa5c06afa24 (diff) | |
Pass --with-macosx-version-min-required into external/curl
...which wants to take it from CFLAGS, otherwise defaults to 10.8
Change-Id: I1b086ee8abba1e4b46c67b6b4fe6a05c4ef7a3d8
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 1b6361d24e1f..f660310b38f6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -366,6 +366,7 @@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@ +export MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=@MAC_OS_X_VERSION_MIN_REQUIRED_DOTS@ export MANDIR=@MANDIR@ export MARIADBC_MAJOR=@MARIADBC_MAJOR@ export MARIADBC_MICRO=@MARIADBC_MICRO@ diff --git a/configure.ac b/configure.ac index fb4f406ef02d..cd4a190c7501 100644 --- a/configure.ac +++ b/configure.ac @@ -2706,6 +2706,7 @@ if test $_os = Darwin -o $_os = iOS; then AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.9--13]) ;; esac + MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required LIBTOOL=/usr/bin/libtool INSTALL_NAME_TOOL=install_name_tool @@ -2842,6 +2843,7 @@ AC_SUBST(MACOSX_SDK_PATH) AC_SUBST(MACOSX_SDK_VERSION) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED) +AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS) AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED) AC_SUBST(INSTALL_NAME_TOOL) AC_SUBST(LIBTOOL) # Note that the OS X libtool command is unrelated to GNU libtool diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index bd03275d4888..a8a03a568246 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -58,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(if $(ENABLE_DEBUG),--enable-debug) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter MACOSX,$(OS)),CFLAGS='$(CFLAGS) \ + -mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS)') \ CPPFLAGS='$(curl_CPPFLAGS)' \ LDFLAGS='$(curl_LDFLAGS)' \ ZLIB_CFLAGS='$(ZLIB_CFLAGS)' ZLIB_LIBS='$(ZLIB_LIBS)' \ |