From 8b4deabeedd09f5968fa90ae04209ded4a717f6f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 19 Sep 2013 18:27:11 +0200 Subject: gbuild: rename LinkTarget variable LIBS LIBS is apparently used by autotools build system and passed to configure at least in mythes and hunspell, where the LinkTarget variable could cause problems by inheritance. Change-Id: Ia267dd0a24c96914208869d7b47552b44a701735 --- solenv/gbuild/LinkTarget.mk | 6 +++--- solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 +- solenv/gbuild/platform/android.mk | 2 +- solenv/gbuild/platform/com_MSC_class.mk | 2 +- solenv/gbuild/platform/macosx.mk | 2 +- solenv/gbuild/platform/mingw.mk | 4 ++-- solenv/gbuild/platform/solaris.mk | 2 +- solenv/gbuild/platform/unxgcc.mk | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e1c2a9494577..277232558777 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -589,7 +589,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call gb_LinkTarget__get_ldflags,$(2)) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := -$(call gb_LinkTarget_get_target,$(1)) : LIBS := +$(call gb_LinkTarget_get_target,$(1)) : T_LIBS := $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 := $(call gb_LinkTarget_get_headers_target,$(1)) \ @@ -777,7 +777,7 @@ endef # call gb_LinkTarget_add_libs,linktarget,libs define gb_LinkTarget_add_libs -$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) +$(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(2) endef @@ -786,7 +786,7 @@ endef # exceptional cases this disable method may be used # call gb_LinkTarget_disable_standard_system_libs,linktarget define gb_LinkTarget_disable_standard_system_libs -$(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out $$(gb_STDLIBS),$$(LIBS)) +$(call gb_LinkTarget_get_target,$(1)) : T_LIBS := $$(filter-out $$(gb_STDLIBS),$$(T_LIBS)) endef diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index d75cb17de175..57c695cb3d43 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -122,7 +122,7 @@ define gb_LinkTarget__command_dynamiclink $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ $(wildcard $(OUTDIR)/lib/*.a) \ - $(LIBS) \ + $(T_LIBS) \ -o $(1)) endef diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 33b3d0887f1f..23839b1a4693 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -49,7 +49,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) \ + $(T_LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ -o $(1)) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index af84d3526158..bf5a79c4c2cc 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \ - $(LIBS) \ + $(T_LIBS) \ $(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \ $(if $(filter-out StaticLibrary,$(TARGETTYPE)),-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest) \ -pdb:$(WORKDIR)/LinkTarget/$(2).pdb \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5d601af0960f..e23fd94eca60 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -150,7 +150,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - $(LIBS) \ + $(T_LIBS) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1) && \ $(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \ diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index e36343b51c23..c3b319eaae1b 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -110,7 +110,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(NATIVERES) \ $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))))) \ - $(LIBS) \ + $(T_LIBS) \ -Wl$(COMMA)-Map$(COMMA)$(WORKDIR)/LinkTarget/$(2).map \ -o $(1))) endef @@ -130,7 +130,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(NATIVERES) \ $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))))) \ - $(LIBS) \ + $(T_LIBS) \ -Wl$(COMMA)-Map$(COMMA)$(WORKDIR)/LinkTarget/$(2).map \ -Wl$(COMMA)--out-implib$(COMMA)$(ILIBTARGET) \ -o $(1) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index e68411606e85..8505f06669dc 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -183,7 +183,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group \ - $(LIBS) \ + $(T_LIBS) \ $(foreach lib,$(LINKED_STATIC_LIBS),\ $(call gb_StaticLibrary_get_target,$(lib))) \ -Wl$(COMMA)--end-group \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index beb2567f9db5..c839db111fff 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group \ - $(LIBS) \ + $(T_LIBS) \ $(foreach lib,$(LINKED_STATIC_LIBS),\ $(call gb_StaticLibrary_get_target,$(lib))) \ -Wl$(COMMA)--end-group \ -- cgit