diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-02 11:19:38 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-03 16:06:14 +0200 |
| commit | 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f (patch) | |
| tree | 7d4be7e8156d2fcdb85fb00bf60f32200054fe24 /bridges | |
| parent | d19b79e4b4998eddd1baa1ab6a42c4f557889a60 (diff) | |
makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)
…by a simple/static $(gb_CustomTarget_workdir)/foo
The build system has a lot of overly complicated leftovers from when it
was introduced and had not only deal with split repositories but also
had to coexist with another buildsystem. Along with lots of copy'n'paste
along the years the makefiles became hard to grasp for newcomers with
all our calls and evals.
As a first step to streamline that, the macros from TargetLocations that
simply prefix a static path to the argument (and similar of the same
kind) are a natural pick before simplifying the rules themselves/getting
rid of a bunch of eval statements.
Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
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) |