diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 15:47:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
| commit | 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (patch) | |
| tree | 1a08747389ce8a76f0c5d18245a596b61265718a | |
| parent | fa489789359d130735a814366154a3d91ec882a9 (diff) | |
gbuild: OpenBSD: remove custom gb_LinkTarget__command_dynamiclink:
Should no longer be necessary with the new handling of gb_STDLIBS.
Change-Id: Ia94a7266806e2d09d7608f642b25933e42499525
| -rw-r--r-- | solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 23 | ||||
| -rw-r--r-- | solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 23 |
2 files changed, 0 insertions, 46 deletions
diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk index 50267d307251..73090f0e7e20 100644 --- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk @@ -33,29 +33,6 @@ gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk -define gb_LinkTarget__command_dynamiclink -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(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) \ - $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) - $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) -endef - gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk index 34f35a36f7fd..89ef15e54887 100644 --- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk @@ -32,29 +32,6 @@ gb_STDLIBS := $(PTHREAD_LIBS) include $(GBUILDDIR)/platform/unxgcc.mk -define gb_LinkTarget__command_dynamiclink -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - $(gb_CXX) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir $(1)).$(SOVERSION)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ - $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ - $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ - $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ - $(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) \ - $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \ - -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1))) - $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1)) -endef - gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS # vim: set noet sw=4: |