diff options
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/CustomTarget_gcc3_linux_arm.mk | 12 | ||||
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bridges/CustomTarget_gcc3_linux_arm.mk b/bridges/CustomTarget_gcc3_linux_arm.mk index 327f1e06a54a..1cc5a6fcd4f9 100644 --- a/bridges/CustomTarget_gcc3_linux_arm.mk +++ b/bridges/CustomTarget_gcc3_linux_arm.mk @@ -10,16 +10,16 @@ $(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.objectlist + $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist -$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \ +$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.o : \ $(SRCDIR)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S \ - | $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/.dir + | $(gb_CustomTarget_workdir)/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 : \ - $(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)/.dir +$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist : \ + $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.o \ + | $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/.dir echo $< > $@ # vim: set noet sw=4 ts=4: diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 7b10348e83b7..dcf83cf34e5b 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -16,9 +16,9 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm bridge_noopt_objects := cpp2uno except uno2cpp # HACK $(call gb_Library_get_linktarget_target,gcc3_uno) : \ - $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist + $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist $(call gb_Library_get_linktarget_target,gcc3_uno) : \ - EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist + EXTRAOBJECTLISTS += $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist endif else ifeq ($(CPUNAME),AARCH64) |