Kaydet (Commit) 8b4deabe authored tarafından Michael Stahl's avatar Michael Stahl

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
üst f861ae6a
...@@ -589,7 +589,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \ ...@@ -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)) : 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_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_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)) : TARGETTYPE :=
$(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 := $(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 :=
$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_headers_target,$(1)) \
...@@ -777,7 +777,7 @@ endef ...@@ -777,7 +777,7 @@ endef
# call gb_LinkTarget_add_libs,linktarget,libs # call gb_LinkTarget_add_libs,linktarget,libs
define gb_LinkTarget_add_libs define gb_LinkTarget_add_libs
$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2) $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(2)
endef endef
...@@ -786,7 +786,7 @@ endef ...@@ -786,7 +786,7 @@ endef
# exceptional cases this disable method may be used # exceptional cases this disable method may be used
# call gb_LinkTarget_disable_standard_system_libs,linktarget # call gb_LinkTarget_disable_standard_system_libs,linktarget
define gb_LinkTarget_disable_standard_system_libs 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 endef
......
...@@ -122,7 +122,7 @@ define gb_LinkTarget__command_dynamiclink ...@@ -122,7 +122,7 @@ define gb_LinkTarget__command_dynamiclink
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(wildcard $(OUTDIR)/lib/*.a) \ $(wildcard $(OUTDIR)/lib/*.a) \
$(LIBS) \ $(T_LIBS) \
-o $(1)) -o $(1))
endef endef
......
...@@ -49,7 +49,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -49,7 +49,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ -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))))) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
-o $(1)) -o $(1))
endef endef
......
...@@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -195,7 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\
@$${RESPONSEFILE} \ @$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(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)),user32.lib) \
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest) \ $(if $(filter-out StaticLibrary,$(TARGETTYPE)),-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest) \
-pdb:$(WORKDIR)/LinkTarget/$(2).pdb \ -pdb:$(WORKDIR)/LinkTarget/$(2).pdb \
......
...@@ -150,7 +150,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -150,7 +150,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
$(LIBS) \ $(T_LIBS) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
-o $(1) && \ -o $(1) && \
$(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \ $(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \
......
...@@ -110,7 +110,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -110,7 +110,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(NATIVERES) \ $(NATIVERES) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ $(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))))) \ $(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)-Map$(COMMA)$(WORKDIR)/LinkTarget/$(2).map \
-o $(1))) -o $(1)))
endef endef
...@@ -130,7 +130,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -130,7 +130,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(NATIVERES) \ $(NATIVERES) \
$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ $(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))))) \ $(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)-Map$(COMMA)$(WORKDIR)/LinkTarget/$(2).map \
-Wl$(COMMA)--out-implib$(COMMA)$(ILIBTARGET) \ -Wl$(COMMA)--out-implib$(COMMA)$(ILIBTARGET) \
-o $(1) \ -o $(1) \
......
...@@ -183,7 +183,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -183,7 +183,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-Wl$(COMMA)--start-group \ -Wl$(COMMA)--start-group \
$(LIBS) \ $(T_LIBS) \
$(foreach lib,$(LINKED_STATIC_LIBS),\ $(foreach lib,$(LINKED_STATIC_LIBS),\
$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_StaticLibrary_get_target,$(lib))) \
-Wl$(COMMA)--end-group \ -Wl$(COMMA)--end-group \
......
...@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-Wl$(COMMA)--start-group \ -Wl$(COMMA)--start-group \
$(LIBS) \ $(T_LIBS) \
$(foreach lib,$(LINKED_STATIC_LIBS),\ $(foreach lib,$(LINKED_STATIC_LIBS),\
$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_StaticLibrary_get_target,$(lib))) \
-Wl$(COMMA)--end-group \ -Wl$(COMMA)--end-group \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment