diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-12 00:54:11 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-12 01:05:44 +0200 |
| commit | e733650ab7fd6e9c0ece21cdd8cf2defae0746ee (patch) | |
| tree | ccffeeb00fce195af459cfd32c7c6fe7d0ed0b65 /solenv | |
| parent | Related: fdo#37716 null pointer check for the unit test (diff) | |
| download | core-e733650ab7fd6e9c0ece21cdd8cf2defae0746ee.tar.gz core-e733650ab7fd6e9c0ece21cdd8cf2defae0746ee.zip | |
Always use -shared and -llog -landroid for Android also in gbuild
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index 92ad3661832a..695f68d701dc 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -39,4 +39,30 @@ include $(GBUILDDIR)/platform/unxgcc.mk # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : +# Re-define this shebang from unxgcc.mk, adding -shared and -llog +# -landroid Just temporarily done this way, shm_get promised to do +# this in some more elegant fashion. + +define gb_LinkTarget__command_dynamiclink +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + $(gb_CXX) \ + -shared \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ + $(subst \d,$$,$(RPATH)) \ + $(T_LDFLAGS) \ + $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ + $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ + $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ + $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ + $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ + $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ + -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ + $(LIBS) \ + $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ + -llog -landroid \ + -o $(1)) +endef + # vim: set noet sw=4: |