summaryrefslogtreecommitdiffstats
path: root/solenv
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-26 14:11:18 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-26 14:22:20 -0400
commit3326a85ae6ad417b37deeee52fd9a806f42004ba (patch)
treeacfa52f0a147114f86923741cb2f401aab2e3aad /solenv
parentmake module-deps.pl work in separate builddir (diff)
downloadcore-3326a85ae6ad417b37deeee52fd9a806f42004ba.tar.gz
core-3326a85ae6ad417b37deeee52fd9a806f42004ba.zip
fix postgresql build
Change-Id: I379029dbf600769e415582aa7162f320e707c3da
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/LinkTarget.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 61bdec4a0df6..52d268441892 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -826,15 +826,15 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar
$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
endif
-# used by bin/module-deps.pl
-ifneq ($(ENABLE_PRINT_DEPS),)
-$$(eval $$(call gb_PrintDeps_info,$(1),$(2),$(3),$(4)))
-endif
-
gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \
$(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),, merged)) \
$(filter-out $(gb_MERGEDLIBS),$(2))
+# used by bin/module-deps.pl
+ifneq ($(ENABLE_PRINT_DEPS),)
+$$(eval $$(call gb_PrintDeps_info,$(1),$$(gb_LINKED_LIBS),$(3),$(4)))
+endif
+
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS)
$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib)))