diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/ndk-build-helper-1.mk | 2 | ||||
| -rw-r--r-- | build-aux/ndk-build-helper-2.mk | 2 | ||||
| -rw-r--r-- | build-aux/ndk-build-helper-4.mk | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build-aux/ndk-build-helper-1.mk b/build-aux/ndk-build-helper-1.mk index 50def5f1c2d..898edf3a137 100644 --- a/build-aux/ndk-build-helper-1.mk +++ b/build-aux/ndk-build-helper-1.mk @@ -59,7 +59,7 @@ else NDK_SO_NAME = lib$(1)_emacs.so endif -ifeq ($$(NDK_SO_NAMES:$$(NDK_SO_NAME)=),$$(NDK_SO_NAMES)) +ifeq ($$(findstring $$(NDK_SO_NAME),$$(NDK_SO_NAMES)),) NDK_SO_NAMES := $$(NDK_SO_NAMES) $$(NDK_SO_NAME) # Now recurse over this module's dependencies. diff --git a/build-aux/ndk-build-helper-2.mk b/build-aux/ndk-build-helper-2.mk index 3722437c53e..6be7f268fe7 100644 --- a/build-aux/ndk-build-helper-2.mk +++ b/build-aux/ndk-build-helper-2.mk @@ -48,7 +48,7 @@ else NDK_A_NAME = lib$(1).a endif -ifeq ($$(NDK_A_NAMES:$$(NDK_A_NAME)=),$$(NDK_A_NAMES)) +ifeq ($$(findstring $$(NDK_A_NAME),$$(NDK_A_NAMES)),) NDK_A_NAMES := $$(NDK_A_NAMES) $$(NDK_A_NAME) # Now recurse over this module's dependencies. diff --git a/build-aux/ndk-build-helper-4.mk b/build-aux/ndk-build-helper-4.mk index e1024f0a243..a41679c53af 100644 --- a/build-aux/ndk-build-helper-4.mk +++ b/build-aux/ndk-build-helper-4.mk @@ -34,5 +34,6 @@ undefine LOCAL_DISABLE_FORMAT_STRING_CHECKS undefine LOCAL_EXPORT_CFLAGS undefine LOCAL_EXPORT_CPPFLAGS undefine LOCAL_EXPORT_C_INCLUDES +undefine LOCAL_EXPORT_C_INCLUDE_DIRS undefine LOCAL_EXPORT_LDFLAGS undefine LOCAL_EXPORT_LDLIBS |