diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 00:49:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:06 +0200 |
| commit | b85c34978356eb01311f197f00f4dd5f808e3664 (patch) | |
| tree | 7bd759b1b780bb0433609e18736fc6a6816ac19f /jvmfwk | |
| parent | 2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 (diff) | |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/Executable_javaldx.mk | 3 | ||||
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 3 | ||||
| -rw-r--r-- | jvmfwk/Library_sunjavaplugin.mk | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 177947cd0b15..aedb7dbc0b3a 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -31,9 +31,10 @@ $(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 c4a459728324..73a2e6bd5e5c 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jvmfwk)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,jvmfwk,\ advapi32 \ diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 517892fa8e8e..e25d993fac2d 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sunjavaplugin)) + ifeq ($(OS),ANDROID) $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ |