diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-11-05 17:34:22 +1100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-11-12 04:13:14 +0000 |
| commit | 42caa6260d026295a7f425f083827acb40cbb3e1 (patch) | |
| tree | ba3da76ed33e35dc75cb462909abbd9917d1e122 /data | |
| parent | 4ae518fc5a5fbc8f61b61bc1ba54e028e4c0f3eb (diff) | |
ndk-build: fix app compile/link commands for ndk r18
Use the GLOBAL_* arguments as well
Diffstat (limited to 'data')
| -rw-r--r-- | data/ndk-build/gstreamer-1.0.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 7e900cbe..8f73c579 100644 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -174,7 +174,7 @@ else endif # Create the link command -GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(TARGET_LDFLAGS) -shared --sysroot=$(SYSROOT_GST_LINK) \ +GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CXX) $(GLOBAL_LDFLAGS) $(TARGET_LDFLAGS) -nostdlib++ -shared --sysroot=$(SYSROOT_GST_LINK) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) \ $(GSTREAMER_ANDROID_LIBS), $(GSTREAMER_LD)) -Wl,-no-undefined $(GSTREAMER_LD) @@ -212,7 +212,7 @@ genstatic_$(TARGET_ARCH_ABI): # Compile the source file $(GSTREAMER_ANDROID_O): PRIV_C := $(GSTREAMER_ANDROID_C) -$(GSTREAMER_ANDROID_O): PRIV_CC_CMD := $(TARGET_CC) --sysroot=$(SYSROOT_GST_INC) $(SYSROOT_ARCH_INC_ARG) $(TARGET_CFLAGS) \ +$(GSTREAMER_ANDROID_O): PRIV_CC_CMD := $(TARGET_CC) --sysroot=$(SYSROOT_GST_INC) $(SYSROOT_ARCH_INC_ARG) $(GLOBAL_CFLAGS) $(TARGET_CFLAGS) \ -c $(GSTREAMER_ANDROID_C) -Wall -Werror -o $(GSTREAMER_ANDROID_O) $(GSTREAMER_ANDROID_CFLAGS) $(GSTREAMER_ANDROID_O): PRIV_GST_CFLAGS := $(GSTREAMER_ANDROID_CFLAGS) $(TARGET_CFLAGS) $(GSTREAMER_ANDROID_O): genstatic_$(TARGET_ARCH_ABI) @@ -265,4 +265,3 @@ copyfontsres_$(TARGET_ARCH_ABI): copycacertificatesres_$(TARGET_ARCH_ABI): $(hide)$(call host-mkdir,$(GSTREAMER_ASSETS_DIR)/ssl/certs) $(hide)$(call host-cp,$(GSTREAMER_ROOT)/etc/ssl/certs/ca-certificates.crt,$(GSTREAMER_ASSETS_DIR)/ssl/certs) - |