diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 194d88aa4f..1f7c1bcbe5 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -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 ;
diff --git a/configure b/configure
index 52dd3b440d..b68847ce73 100755
--- a/configure
+++ b/configure
@@ -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