diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:29:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
| commit | 5032dc0fc339ba6b200e80a5482cc86e00662a0b (patch) | |
| tree | 6ecb751f6fd25a7ee5f66434b10928423d1e05f7 /solenv/gbuild/Executable.mk | |
| parent | 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (diff) | |
gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.
Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
Diffstat (limited to 'solenv/gbuild/Executable.mk')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 0288c1755f71..8c178175ad4f 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -54,6 +54,7 @@ endef define gb_Executable__Executable_impl $(call gb_LinkTarget_LinkTarget,$(2)) $(call gb_LinkTarget_set_targettype,$(2),Executable) +$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Executable_get_target,$(1))).dir $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) @@ -105,7 +106,7 @@ $(eval $(foreach method,\ add_ldflags \ set_ldflags \ add_libs \ - add_standard_system_libs \ + disable_standard_system_libs \ use_system_darwin_frameworks \ use_system_win32_libs \ set_library_path_flags \ |