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 /jvmfwk | |
| 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 'jvmfwk')
| -rw-r--r-- | jvmfwk/Executable_javaldx.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/Library_sunjavaplugin.mk | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index aedb7dbc0b3a..0e64f3ffc5d8 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -33,8 +33,6 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,javaldx)) - $(eval $(call gb_Executable_add_exception_objects,javaldx,\ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5051a2b9bb17..697642c4479f 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 61ff7bdfe5ac..d32dc70aa22c 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) - ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ |