Patch by Andreas Färber modified by myself:
* Determine HOST_LD and HOST_OBJCOPY in configure.
* Removed Solaris ld work-around in BuildSetup.
The change requires configure to be re-run. Alternatively HOST_{LD,OBJCOPY}
can be added to generated/build/BuildConfig.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34892 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -494,8 +494,6 @@ HOST_AR ?= $(AR) ;
|
||||
HOST_CC ?= $(CC) ;
|
||||
HOST_C++ ?= $(C++) ;
|
||||
HOST_LINK ?= $(LINK) ;
|
||||
HOST_LD ?= ld ; # TODO: Fix this!
|
||||
HOST_OBJCOPY ?= objcopy ; #
|
||||
HOST_RANLIB ?= $(RANLIB) ;
|
||||
HOST_CPPFLAGS ?= $(CPPFLAGS) ;
|
||||
HOST_CCFLAGS ?= $(HOST_GCC_BASE_FLAGS) $(CCFLAGS) ;
|
||||
@@ -526,12 +524,6 @@ if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
|
||||
}
|
||||
}
|
||||
|
||||
# TODO: Temporary work-around for mixup of GNU and Sun linker on OpenSolaris.
|
||||
# Should be moved to configure.
|
||||
if $(HOST_PLATFORM) = sunos && $(HOST_LD) = ld {
|
||||
HOST_LD = /usr/ccs/bin/ld ;
|
||||
}
|
||||
|
||||
if $(HOST_PLATFORM) = cygwin {
|
||||
HOST_LINKFLAGS += -Xlinker --allow-multiple-definition -Xlinker
|
||||
--enable-auto-import ;
|
||||
|
||||
@@ -268,6 +268,8 @@ haikuSharedLibSupCxx=
|
||||
haikuCxxHeadersDir=
|
||||
hostGCCVersion=`gcc -dumpversion`
|
||||
hostGCCMachine=`gcc -dumpmachine`
|
||||
hostGCCLD=`gcc -print-prog-name=ld`
|
||||
hostGCCObjcopy=`gcc -print-prog-name=objcopy`
|
||||
includeGPLAddOns=0
|
||||
includePatentedCode=0
|
||||
include3rdParty=0
|
||||
@@ -514,6 +516,8 @@ HAIKU_UNARFLAGS ?= ${HAIKU_UNARFLAGS} ;
|
||||
|
||||
HOST_GCC_RAW_VERSION ?= ${hostGCCVersion} ;
|
||||
HOST_GCC_MACHINE ?= ${hostGCCMachine} ;
|
||||
HOST_LD ?= ${hostGCCLD} ;
|
||||
HOST_OBJCOPY ?= ${hostGCCObjcopy} ;
|
||||
|
||||
EOF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user