[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android edfa0f8fa0d: Minor fixes to configury
From: |
Po Lu |
Subject: |
feature/android edfa0f8fa0d: Minor fixes to configury |
Date: |
Fri, 3 Mar 2023 08:59:07 -0500 (EST) |
branch: feature/android
commit edfa0f8fa0d2e0ed55f749fa93412488f14e39b9
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Minor fixes to configury
* configure.ac (ANDROID_SDK_8_OR_EARLIER): Pass through
`--with-ndk-cxx-shared'.
* m4/ndk-build.m4: Fix quoting of $CC.
---
configure.ac | 9 ++++++---
m4/ndk-build.m4 | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index d8772b7803e..0eb7db1cb29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,7 @@ if test "$XCONFIGURE" = "android"; then
# Make sure to pass through the CFLAGS, as older versions of the
# NDK require them to be able to find system includes.
with_ndk_path="$android_ndk_path"
+ with_ndk_cxx_shared="$android_ndk_cxx_shared"
ndk_INIT([$android_abi], [$ANDROID_SDK], [cross/ndk-build],\
[$ANDROID_CFLAGS])
fi
@@ -1150,9 +1151,11 @@ package will likely install on older systems but crash
on startup.])
passthrough="$passthrough --with-imagemagick=$with_imagemagick"
passthrough="$passthrough --with-lcms2=$with_lcms2"
- AS_IF([XCONFIGURE=android ANDROID_CC="$ANDROID_CC" \
- ANDROID_SDK="$android_sdk" android_abi=$android_abi \
- android_ndk_path="$with_ndk_path" $0 $passthrough], [],
+ AS_IF([XCONFIGURE=android ANDROID_CC="$ANDROID_CC" \
+ ANDROID_SDK="$android_sdk" android_abi=$android_abi \
+ android_ndk_path="$with_ndk_path" \
+ android_ndk_cxx_shared="$with_ndk_cxx_shared" \
+ $0 $passthrough], [],
[AC_MSG_ERROR([Failed to cross-configure Emacs for android.])])
# Now set ANDROID to yes.
diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4
index 8fe84cee40e..d635b8d1a6b 100644
--- a/m4/ndk-build.m4
+++ b/m4/ndk-build.m4
@@ -182,7 +182,7 @@ that could not be found in the list of directories
specified in \
}
# Look for a suitable ar in the same directory as the C compiler.
-ndk_cc_firstword=`AS_ECHO([$CC]) | cut -d' ' -f1`
+ndk_cc_firstword=`AS_ECHO(["$CC"]) | cut -d' ' -f1`
ndk_where_cc=`which $ndk_cc_firstword`
ndk_ar_search_path=$PATH
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/android edfa0f8fa0d: Minor fixes to configury,
Po Lu <=