diff options
| author | Lubos Lunak <l.lunak@suse.cz> | 2012-10-18 16:03:44 +0200 |
|---|---|---|
| committer | Lubos Lunak <l.lunak@suse.cz> | 2012-10-19 10:15:43 +0200 |
| commit | 1b3dc82a01a97b917c2cba402ffd8c2d5238910c (patch) | |
| tree | 5b99a69892a4b93d8f10d2a6316cae733e20f28f /solenv | |
| parent | only one warning per one SAL_INFO/SAL_WARN (diff) | |
| download | core-1b3dc82a01a97b917c2cba402ffd8c2d5238910c.tar.gz core-1b3dc82a01a97b917c2cba402ffd8c2d5238910c.zip | |
use gb_LINKEROPTFLAGS if no explicit LDFLAGS is given
I have no idea why gb_LINKEROPTFLAGS stopped working, it used to be used
and I can't find the commit that removed it.
Change-Id: I537e4e7b686ecc34022f2097fa3e666295294e04
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 1d7d66c8b5a3..870bad1fb13c 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -508,7 +508,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) -$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(LDFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(if $(LDFLAGS),$(LDFLAGS),$(gb_LINKEROPTFLAGS)) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LIBS := |