diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-24 07:52:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-24 07:52:15 +0200 |
| commit | 1c2285bb3628afd615fadbc2453db1cf51c102d7 (patch) | |
| tree | cb4da69999c5b7082417241f9924934317899cc5 /bridges | |
| parent | 8e16b532dd7b2e5691357fd1cb9f72f449e14e58 (diff) | |
another attempt to fix android ARM build
Change-Id: I36488341d84cb2db05ba564dafa65add79eff9da
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/CustomTarget_gcc3_linux_arm.mk | 4 | ||||
| -rw-r--r-- | bridges/Library_gcc3_linux_arm.mk | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/bridges/CustomTarget_gcc3_linux_arm.mk b/bridges/CustomTarget_gcc3_linux_arm.mk index 85c562798aef..b36ac78cf0f0 100644 --- a/bridges/CustomTarget_gcc3_linux_arm.mk +++ b/bridges/CustomTarget_gcc3_linux_arm.mk @@ -10,7 +10,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_linux_arm)) $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm) : \ - $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \ @@ -19,7 +18,8 @@ $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhel $(gb_CXX) -c -o $@ $< -fPIC $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist : \ + $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \ | $(dir $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm)).dir - echo $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o > $@ + echo $< > $@ # vim: set noet sw=4 ts=4: diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 507cfc3b7c1f..c37275a02dba 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -14,10 +14,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm $(eval $(call gb_Library_Library,gcc3_uno)) -$(eval $(call gb_Library_use_custom_headers,gcc3_uno,\ - bridges/source/cpp_uno/gcc3_linux_arm \ -)) - $(eval $(call gb_Library_use_internal_comprehensive_api,gcc3_uno,\ udkapi \ )) @@ -68,6 +64,8 @@ $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\ # HACK $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,gcc3_uno)) : \ + $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,gcc3_uno)) : \ EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist # vim: set noet sw=4 ts=4: |