diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-05 09:34:49 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-06 12:39:23 +0100 |
| commit | be46157bb2436798cba163983f98107faa1553b8 (patch) | |
| tree | 193e37b25d9dfcd2794b43f4115d7a63f9408e09 /solenv | |
| parent | 0a1e834a7370dec036b621ef1906cf261eb13f58 (diff) | |
clean SOLARLIB post dmake removal
I think it should die completely but openbsd and solaris still use it.
Probably just setting LDFLAGS should be enough for them ?
Also SOLARINC_FOR_BUILD and SOLARLIB_FOR_BUILD are not used anywhere.
Change-Id: I1c11981f859876af8b90e8ba60fce2820b354022
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index e29a9bf67c1f..1a3737ebc385 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -75,8 +75,7 @@ gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS) gb_COMPILERDEFS += \ -DBOOST_DETAIL_NO_CONTAINER_FWD -gb_LinkTarget_LDFLAGS := \ - $(subst -L../lib , ,$(SOLARLIB)) \ +gb_LinkTarget_LDFLAGS := $(SOLARLIB) \ #man ld says: obsolete -Wl,-multiply_defined,suppress \ gb_DEBUG_CFLAGS := -g -fno-inline diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index b70e84b46eb5..533aef8d691a 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -95,7 +95,7 @@ gb_LinkTarget_LDFLAGS := \ -Wl,--exclude-symbols,__main \ -Wl,--enable-stdcall-fixup \ -Wl,--enable-runtime-pseudo-reloc-v2 \ - $(subst -L../lib , ,$(SOLARLIB)) \ + $(SOLARLIB) \ ifeq ($(MINGW_GCCLIB_EH),YES) gb_LinkTarget_LDFLAGS += -shared-libgcc diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c770d9094d46..4065fa012370 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -89,7 +89,7 @@ gb_OBJCFLAGS := -x objective-c -fobjc-exceptions gb_LinkTarget_LDFLAGS := \ $(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \ - $(subst -L../lib , ,$(SOLARLIB)) \ + $(SOLARLIB) \ #man ld says: obsolete -Wl,-multiply_defined,suppress \ gb_DEBUG_CFLAGS := -g diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index d7a14c53c8e2..1cc130cb27cd 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -125,7 +125,7 @@ gb_LinkTarget_LDFLAGS += \ -L$(SYSBASE)/lib \ -L$(SYSBASE)/usr/lib \ -Wl,-z,combreloc \ - $(subst -L../lib , ,$(SOLARLIB)) \ + $(SOLARLIB) \ ifeq ($(HAVE_LD_HASH_STYLE),TRUE) gb_LinkTarget_LDFLAGS += \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 63aafda7de0e..5f32825790ee 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -120,7 +120,7 @@ endif gb_LinkTarget_LDFLAGS += \ -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ -Wl,-z,combreloc \ - $(subst -L../lib , ,$(SOLARLIB)) \ + $(SOLARLIB) \ ifeq ($(HAVE_LD_HASH_STYLE),TRUE) gb_LinkTarget_LDFLAGS += \ |