diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index f43ccf7d22..08b1e7374b 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -30,7 +30,8 @@ rule AddSharedObjectGlueCode
 
 			NEEDLIBS on $(1) =  [ on $(1) return $(NEEDLIBS) ] $(stdLibs) ;
 			Depends $(1) : $(stdLibs) $(beginGlue) $(endGlue) ;
-			LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
+			LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib
+				-Xlinker --no-undefined ;
 		}
 	}
 
@@ -52,7 +53,7 @@ rule Executable
 	Main $(1) : $(2) ;
 	LinkAgainst $(1) : $(3) ;
 	LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ]
-		-Xlinker --no-undefined -Xlinker -soname=_APP_  ;
+		-Xlinker -soname=_APP_  ;
 
 	# we link with -nostdlib and add the required libs manually, when building
 	# for Haiku
@@ -112,8 +113,7 @@ rule Addon target : sources : libraries : isExecutable
 
 	Main $(target) : $(sources) ;
 
-	local linkFlags = -Xlinker --no-undefined
-		-Xlinker -soname=\"$(target:G=)\" ;
+	local linkFlags = -Xlinker -soname=\"$(target:G=)\" ;
 	if $(isExecutable) != true {
 		linkFlags = -nostart $(linkFlags) ;
 	}
@@ -398,7 +398,7 @@ rule SharedLibraryFromObjects
 
 	MainFromObjects $(_lib) : $(2) ;
 	LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ]
-		-nostart -Xlinker --no-undefined -Xlinker -soname=\"$(_lib:G=)\" ;
+		-nostart -Xlinker -soname=\"$(_lib:G=)\" ;
 	LinkAgainst $(_lib) : $(3) ;
 
 	AddSharedObjectGlueCode $(_lib) : false ;