From 1d08d3993ee008903882c058e264fc2dcc4af0af Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 26 Feb 2020 10:12:54 -0600
Subject: [PATCH] efi: Don't skip TargetBootLibgcc, we need it for 32-bit fp
 math

Change-Id: I23db3cbb57fea1f9346db9477f72bcc164794926
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2282
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
---
 build/jam/BootRules | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/build/jam/BootRules b/build/jam/BootRules
index 6095e9d21b..61761cfef7 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -125,15 +125,13 @@ rule BootLd
 
 	# Remove any preset LINKLIBS, but link against libgcc.a. Linking against
 	# libsupc++ is opt-out.
-	if $(TARGET_BOOT_PLATFORM) != efi {
-		local libs ;
-		if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] {
-			libs += [ TargetBootLibsupc++ true ] ;
-			Depends $(1) : [ TargetBootLibsupc++ ] ;
-		}
-		LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ;
-		Depends $(1) : [ TargetBootLibgcc ] ;
+	local libs ;
+	if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] {
+		libs += [ TargetBootLibsupc++ true ] ;
+		Depends $(1) : [ TargetBootLibsupc++ ] ;
 	}
+	LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ;
+	Depends $(1) : [ TargetBootLibgcc ] ;
 
 	# TODO: Do we really want to invoke SetupBoot here? The objects should
 	# have been compiled with BootObjects anyway, so we're doing that twice.