diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-04 19:09:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-04 19:17:28 +0200 |
| commit | d51af3a62a640783993e83566c3a86d62f24637b (patch) | |
| tree | 7fbc58d9c7f7b576aecdb68aa2f8d2623588218f /solenv | |
| parent | a87f45ab78b61dba6b615a88846682b0c35d7d40 (diff) | |
solaris.mk: re-add nsl and socket libraries
Seems these were dropped in 3c4cd1deaf71d0d800957b3580d426c721bf7844.
Change-Id: Ib929e322719e4a50d8d2d32e3cd9466242e1c034
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index d0cbdafbee57..8639793ce636 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -217,7 +217,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ - $(LIBS) -lnsl -lsocket \ + $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ -o $(1)) endef @@ -255,6 +255,11 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) +gb_STDLIBS := \ + m \ + nsl \ + socket \ + gb_Library_PLAINLIBS_NONE += \ dl \ fontconfig \ @@ -263,7 +268,9 @@ gb_Library_PLAINLIBS_NONE += \ GLU \ ICE \ m \ + nsl \ pthread \ + socket \ SM \ ICE \ X11 \ |