Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by Andreas Färber modified by myself:

Browse Source 
* 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:
Ingo Weinhold 2010-01-04 17:50:52 +00:00
parent 8dd44be804
commit 3e5498e4c9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/jam/BuildSetup
View File

@ -186,7 +186,7 @@ switch $(HAIKU_GCC_MACHINE) {
case m68k-* : HAIKU_CPU = m68k ;
case mipsel-* : HAIKU_CPU = mipsel ;
case arm-* : HAIKU_CPU = arm ;
case * : Exit "Unsupported gcc target machine:"
case * : Exit "Unsupported gcc target machine:"
$(HAIKU_GCC_MACHINE) ;
}
@ -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 ;

4
configure vendored
View File

@ -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