diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-02-25 13:12:52 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-02-25 13:14:08 +0100 |
| commit | b06e46f9cab38ded5b269cfeaa43bb75dae2cddb (patch) | |
| tree | 722be1c0710e7803c8bea1ff7eb9b47a96c7f937 | |
| parent | a797539112b1c4351d223dda293e6734e63495ee (diff) | |
Don't override SYSROOT for our usage
Otherwise it will always be set, and for newer ndk-build versions that
don't set it automatically it will contain the sysroot for the first
target architecture if building for multiple.
| -rwxr-xr-x | data/ndk-build/gstreamer-1.0.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 120cb01d..cd8dcbf8 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -147,11 +147,13 @@ GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS) # now points to the root directory. But this will probably change in the future from: # https://android.googlesource.com/platform/ndk/+/fa8c1b4338c1bef2813ecee0ee298e9498a1aaa7 ifndef SYSROOT - SYSROOT := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH) + SYSROOT_GST := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-$(TARGET_ARCH) +else + SYSROOT_GST := $(SYSROOT) endif # Create the link command -GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(TARGET_LDFLAGS) -shared --sysroot=$(SYSROOT) \ +GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(TARGET_LDFLAGS) -shared --sysroot=$(SYSROOT_GST) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) $(G_IO_MODULES_PATH) \ $(GSTREAMER_ANDROID_LIBS), $(GSTREAMER_LD)) -Wl,-no-undefined $(GSTREAMER_LD) @@ -187,7 +189,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) $(TARGET_CFLAGS) \ +$(GSTREAMER_ANDROID_O): PRIV_CC_CMD := $(TARGET_CC) --sysroot=$(SYSROOT_GST) $(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) |