diff options
| author | Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com> | 2012-07-09 11:52:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-10 18:45:35 +0200 |
| commit | 7d7b41cf12a7026ea583e34dbb31196a884db65b (patch) | |
| tree | 2f14ab9fce6fd13fb23ee21f49e6f7cb9f9093ec /solenv | |
| parent | 88da060b47b46da506a6760f7b24cd95cfc6a8f6 (diff) | |
solaris/intel: update .mk files to fix build errors
Change-Id: Iba306cde71eb5efeed29a4a44cefa19a47bac84b
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 9 |
1 files changed, 4 insertions, 5 deletions
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) \ ) |