Ticket #5174: sun-ld-configure.diff

File sun-ld-configure.diff, 1.1 KB (added by andreasf, 11 years ago)

proposed patch

  • build/jam/BuildSetup

    diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
    index 7c8ae46..145999e 100644
    a b if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd  
    516516    }
    517517}
    518518
    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 
    525519if $(HOST_PLATFORM) = cygwin {
    526520    HOST_LINKFLAGS += -Xlinker --allow-multiple-definition -Xlinker
    527521        --enable-auto-import ;
  • configure

    diff --git a/configure b/configure
    index 6641943..72b1320 100755
    a b case "$haikuGCCMachine" in  
    462462       exit 1 ;;
    463463esac
    464464
     465# explicitely set HOST_LD to resolve conflicts between GCC and non-GCC ld
     466hostGCCLD=`gcc -print-prog-name=ld`
     467
    465468# Generate BuildConfig
    466469cat << EOF > "$buildOutputDir/BuildConfig"
    467470# BuildConfig
    HAIKU_UNARFLAGS ?= ${HAIKU_UNARFLAGS} ;  
    510513
    511514HOST_GCC_RAW_VERSION        ?= ${hostGCCVersion} ;
    512515HOST_GCC_MACHINE            ?= ${hostGCCMachine} ;
     516HOST_LD                     ?= ${hostGCCLD} ;
    513517
    514518EOF
    515519