diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 7c8ae46..145999e 100644
|
a
|
b
|
if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
|
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | | # TODO: Temporary work-around for mixup of GNU and Sun linker on OpenSolaris. |
| 520 | | # Should be moved to configure. |
| 521 | | if $(HOST_PLATFORM) = sunos && $(HOST_LD) = ld { |
| 522 | | HOST_LD = /usr/ccs/bin/ld ; |
| 523 | | } |
| 524 | | |
| 525 | 519 | if $(HOST_PLATFORM) = cygwin { |
| 526 | 520 | HOST_LINKFLAGS += -Xlinker --allow-multiple-definition -Xlinker |
| 527 | 521 | --enable-auto-import ; |
diff --git a/configure b/configure
index 6641943..72b1320 100755
|
a
|
b
|
case "$haikuGCCMachine" in
|
| 462 | 462 | exit 1 ;; |
| 463 | 463 | esac |
| 464 | 464 | |
| | 465 | # explicitely set HOST_LD to resolve conflicts between GCC and non-GCC ld |
| | 466 | hostGCCLD=`gcc -print-prog-name=ld` |
| | 467 | |
| 465 | 468 | # Generate BuildConfig |
| 466 | 469 | cat << EOF > "$buildOutputDir/BuildConfig" |
| 467 | 470 | # BuildConfig |
| … |
… |
HAIKU_UNARFLAGS ?= ${HAIKU_UNARFLAGS} ;
|
| 510 | 513 | |
| 511 | 514 | HOST_GCC_RAW_VERSION ?= ${hostGCCVersion} ; |
| 512 | 515 | HOST_GCC_MACHINE ?= ${hostGCCMachine} ; |
| | 516 | HOST_LD ?= ${hostGCCLD} ; |
| 513 | 517 | |
| 514 | 518 | EOF |
| 515 | 519 | |
