diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-23 11:57:40 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-23 12:03:10 +0200 |
| commit | 8f6b43052d05f34e088eb20015eeb47860cbf3e6 (patch) | |
| tree | 1f4ef35211932dec9ed7639436549fdab0fba847 /bridges | |
| parent | 99cfb6724bd7243e82492a2163bffd4a26d54c28 (diff) | |
(hopefully) fix build of bridges on linux ARM
Change-Id: I8d7a10e26858dbbcce9c7c47a1dd9668a35736bd
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/CustomTarget_gcc3_linux_arm.mk | 27 | ||||
| -rw-r--r-- | bridges/Library_gcc3_linux_arm.mk | 8 | ||||
| -rw-r--r-- | bridges/Module_bridges.mk | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/bridges/CustomTarget_gcc3_linux_arm.mk b/bridges/CustomTarget_gcc3_linux_arm.mk new file mode 100644 index 000000000000..a38726b51e8b --- /dev/null +++ b/bridges/CustomTarget_gcc3_linux_arm.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(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 \ + | $(dir $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm)).dir + touch $@ + +$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \ + $(SRCDIR)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S + | $(dir $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm)).dir + $(gb_CXX) -c -o $@ $< -fPIC + +$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist : + | $(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 > $@ + +# vim: set noet sw=4 ts=4: diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 81c29d729b5f..507cfc3b7c1f 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -14,6 +14,10 @@ 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 \ )) @@ -62,4 +66,8 @@ $(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) +# HACK +$(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: diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index dbce0fa6fa48..eeec7c5452fe 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ Library_gcc3_linux_alpha \ ) \ $(if $(and $(filter GCCR,$(COM)$(CPU)),$(filter ANDROID LINUX,$(OS))),\ + CustomTarget_gcc3_linux_arm \ Library_gcc3_linux_arm \ ) \ $(if $(filter GCCLINUXH,$(COM)$(OS)$(CPU)),\ |