diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 12:25:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
| commit | 80374355ab96fa73f2aee8971195faf3cf5985f5 (patch) | |
| tree | fe4aa72179798af1957c3be8948eff18c6f308e9 /extensions | |
| parent | 3c41244209386e22b34cb8da2267383e0238e0ff (diff) | |
gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris
Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Executable_nsplugin.mk | 17 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index da860e821e7c..1117bce24681 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -42,19 +42,22 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\ npsoenv \ )) -$(eval $(call gb_Executable_use_libraries,nsplugin,\ - cppu \ - cppuhelper \ - sal \ +$(eval $(call gb_Executable_add_libs,nsplugin,\ $(if $(filter $(OS),LINUX), \ - dl \ + -ldl \ ) \ $(if $(filter $(OS),SOLARIS), \ - nsl \ - socket \ + -lnsl \ + -lsocket \ ) \ )) +$(eval $(call gb_Executable_use_libraries,nsplugin,\ + cppu \ + cppuhelper \ + sal \ +)) + ifeq ($(GUI),WNT) $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/nsp_windows \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 75872b73465f..a72cabcb6371 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanunx \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,scn,\ - dl \ +$(eval $(call gb_Library_add_libs,scn,\ + -ldl \ )) endif endif |