diff options
| -rw-r--r-- | desktop/Executable_oosplash.mk | 4 | ||||
| -rw-r--r-- | sfx2/Module_sfx2.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 9 |
3 files changed, 7 insertions, 8 deletions
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index a75f11adc795..a4451f3d4325 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -80,8 +80,8 @@ endif ifeq ($(OS),SOLARIS) -$(eval $(call gb_Executable_use_libraries,oosplash,\ - socket \ +$(eval $(call gb_Executable_add_libs,oosplash,\ + -lsocket \ )) endif diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 81b501a60fbf..1e316eb9a6e1 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ )) endif -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) +ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD SOLARIS, $(OS))) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) $(eval $(call gb_Module_add_targets,sfx2,\ Library_qstart \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 8639793ce636..523be8336931 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -302,7 +302,7 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ define gb_Library__get_rpath -$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)')) +$(if $(1),$(strip '-Wl,-rpath,$(1)' -L$(gb_Library_OUTDIRLOCATION))) #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)' endef @@ -312,7 +312,6 @@ endef define gb_Library_Library_platform $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) - endef @@ -364,7 +363,7 @@ gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) define gb_CppunitTest_CppunitTest_platform -$(call gb_LinkTarget_get_target,$(2)) : RPATH := +$(call gb_LinkTarget_get_target,$(2)) : RPATH := -L$(gb_Library_OUTDIRLOCATION) endef @@ -408,8 +407,8 @@ define gb_InstallModuleTarget_InstallModuleTarget_platform $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ - -DCOMID=C52 \ - -DCOMNAME=sunpro5 \ + -DCOMID=gcc3 \ + -DCOMNAME=gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) |