diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 1 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index aad842d03768..75f5543703f2 100644 --- a/configure.ac +++ b/configure.ac @@ -8332,7 +8332,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then JAVAINC="$JAVAINC -I$JAVA_HOME/include" ;; - darwin*) + darwin*|macos*) if test -d "$JAVA_HOME/include/darwin"; then JAVAINC="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin" else @@ -11123,7 +11123,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; AC_MSG_RESULT([yes]) else case "$build_os" in - darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*) + darwin*|macos*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*) x_GNUCP=[\#] GNUCP='' AC_MSG_RESULT([no gnucp found - using the system's cp command]) diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 0a1706031746..2a491d965699 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -76,6 +76,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): --enable-shared --disable-static \ ) \ $(if $(filter MACOSX,$(OS)), \ + --build=$(subst macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM)) \ $(if $(filter 1, \ $(shell expr '$(MAC_OS_X_VERSION_MIN_REQUIRED)' \ '<' 101200)), \ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index ef2ae95d7a5f..fb68da65adff 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -63,7 +63,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ CPU_ARCH=x86_64 \ - NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + NSPR_CONFIGURE_OPTS="--build=$(subst macos,darwin,$(BUILD_PLATFORM)) --host=$(subst macos,darwin,$(HOST_PLATFORM))") \ NSDISTMODE=copy \ $(MAKE) \ AR="$(AR)" \ |