diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-06 22:26:45 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-06 22:26:45 +0800 |
| commit | e1c7b8ad61a213014ae3bf87db197301ab2bac29 (patch) | |
| tree | f8782aea36f9e1a263482705935c60ef99cea6e7 /m4 | |
| parent | 85d225df8731010e7ac64f18dabf49715f384852 (diff) | |
| download | emacs-e1c7b8ad61a213014ae3bf87db197301ab2bac29.tar.gz | |
Adjust ndk-build implementation for old NDK versions
* configure.ac: Pass ANDROID_CFLAGS to ndk_INIT.
* cross/ndk-build/Makefile.in (NDK_BUILD_CFLAGS):
* cross/ndk-build/ndk-build-shared-library.mk
($(call objname,$(LOCAL_MODULE),$(basename $(1)))):
($$(error Unsupported suffix):
* cross/ndk-build/ndk-build-static-library.mk
($(call objname,$(LOCAL_MODULE),$(basename $(1)))):
($$(error Unsupported suffix): Use NDK_BUILD_CFLAGS.
* m4/ndk-build.m4 (ndk_INIT): Accept cflags.
(ndk_CONFIG_FILES): Export NDK_BUILD_CFLAGS.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ndk-build.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4 index 888b587af02..876c980ebb5 100644 --- a/m4/ndk-build.m4 +++ b/m4/ndk-build.m4 @@ -25,10 +25,11 @@ AC_ARG_WITH([ndk_cxx_shared], [AS_HELP_STRING([--with-ndk-cxx-shared], [name of the C++ standard library included with the NDK])]) -# ndk_INIT(ABI, API, DIR) -# -------- +# ndk_INIT(ABI, API, DIR, CFLAGS) +# ------------------------------- # Initialize the Android NDK. ABI is the ABI being built for. # API is the API version being built for. +# CFLAGS is a list of compiler flags. # As a side effect, set the variable ndk_INITIALIZED to true. # DIR should be a directory containing the Makefile.in actually # implementing the Android NDK build system. @@ -50,6 +51,7 @@ ndk_INITIALIZED=yes ndk_API=$2 ndk_DIR=$3 ndk_ANY_CXX= +ndk_BUILD_CFLAGS="$4" case "$ndk_ABI" in *arm64* ) @@ -370,6 +372,7 @@ AC_DEFUN_ONCE([ndk_CONFIG_FILES], NDK_BUILD_MODULES="$ndk_MODULES" NDK_BUILD_CXX_SHARED="$ndk_CXX_SHARED" NDK_BUILD_ANY_CXX_MODULE=$ndk_ANY_CXX + NDK_BUILD_CFLAGS="$ndk_BUILD_CFLAGS" AC_SUBST([NDK_BUILD_ANDROID_MK]) AC_SUBST([NDK_BUILD_ARCH]) @@ -381,6 +384,7 @@ AC_DEFUN_ONCE([ndk_CONFIG_FILES], AC_SUBST([NDK_BUILD_MODULES]) AC_SUBST([NDK_BUILD_CXX_SHARED]) AC_SUBST([NDK_BUILD_ANY_CXX_MODULE]) + AC_SUBST([NDK_BUILD_CFLAGS]) AC_CONFIG_FILES([$ndk_DIR/Makefile]) AC_CONFIG_FILES([$ndk_DIR/ndk-build.mk]) |