diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-18 00:18:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:30 +0200 |
| commit | b4e37acb2b9a25c08b95737ac9e994bfdbb6f4c2 (patch) | |
| tree | 533fdd6ac3337fae18adf915d512e82a9e1f7c17 /solenv/gbuild/platform/solaris.mk | |
| parent | d343c57f982af1b2a9a37362e82e7369b6edf948 (diff) | |
gbuild: remove SOVERSION variable since it is hardcoded anyway
Change-Id: I625291ea86c1c3caf7fa5400e380defa6d0d0bc8
Diffstat (limited to 'solenv/gbuild/platform/solaris.mk')
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index ce95fe3ae3a8..185f92ea5f5b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -172,8 +172,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1))) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ + $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \ + -Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ @@ -187,7 +187,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ -o $(1) \ - $(if $(SOVERSION),&& ln -sf $(notdir $(1)) $(ILIBTARGET)) \ + $(if $(SOVERSIONSCRIPT),&& ln -sf $(notdir $(1)) $(ILIBTARGET)) \ $(if $(filter Library,$(TARGETTYPE)),&& \ readelf -d $(1) | grep SONAME > $(1).exports.tmp ; \ $(NM) --dynamic --extern-only --defined-only --format=posix $(1) \ |