From 5905dfeafff2c8071e6f2e212a077b8450d1a0d6 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 16 Sep 2013 12:13:02 +0200 Subject: gbuild: refactor LinkTarget representation If the link targets are not in workdir then 2 different aspects are needed: the previously used location relative to workdir's LinkTarget dir (for all the misc. related targets), and the full target file. Adding an additional parameter to all LinkTarget functions would be quite annoying, especially since it would need passing through all the gb_LinkTarget__use functions in RepositoryExternal.mk; instead encode both into the linktarget itself, and modify the functions gb_LinkTarget_get_target to return the target and all others to return the workdir linktargetname. - replace gb_Library_get_linktargetname with either: * gb_Library__get_workdir_linktargetname * gb_Library__get_linktarget_target * gb_Library_get_linktarget - similar for gb_Executable_get_linktargetname - similar for gb_StaticLibrary_get_linktargetname - similar for gb_CppunitTest__get_linktargetname - add calls to gb_LinkTarget__get_workdir_linktargetname where needed Change-Id: I917ad7957fee50ec2517a9f9cc9ff452c8d97d1b --- bridges/Library_cpp_uno.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bridges') diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 06038447bc93..699d4c84bbc9 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -29,9 +29,9 @@ else ifneq ($(filter LINUX ANDROID,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_arm bridge_noopt_objects := cpp2uno except uno2cpp # HACK -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,gcc3_uno)) : \ +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,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)) : \ +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \ EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist endif -- cgit