[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    [haiku-commits] haiku: hrev53919 - build/jam
From:       Alex von Gluck IV <kallisti5 () unixzen ! com>
Date:       2020-02-26 18:01:48
Message-ID: 20200226180148.1B5A9251B8 () turing ! freelists ! org
[Download RAW message or body]

hrev53919 adds 1 changeset to branch 'master'
old head: 0e7d1f13e00599c00b094f94b93587ab00888900
new head: 1d08d3993ee008903882c058e264fc2dcc4af0af
overview: https://git.haiku-os.org/haiku/log/?qt=range&q=1d08d3993ee0+%5E0e7d1f13e005

----------------------------------------------------------------------------

1d08d3993ee0: 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>

                          [ Alexander von Gluck IV <kallisti5@unixzen.com> ]

----------------------------------------------------------------------------

Revision:    hrev53919
Commit:      1d08d3993ee008903882c058e264fc2dcc4af0af
URL:         https://git.haiku-os.org/haiku/commit/?id=1d08d3993ee0
Author:      Alexander von Gluck IV <kallisti5@unixzen.com>
Date:        Wed Feb 26 16:12:54 2020 UTC
Committer:   Alex von Gluck IV <kallisti5@unixzen.com>
Commit-Date: Wed Feb 26 18:01:42 2020 UTC

----------------------------------------------------------------------------

1 file changed, 6 insertions(+), 8 deletions(-)
build/jam/BootRules | 14 ++++++--------

----------------------------------------------------------------------------

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.


[prev in list] [next in list] [prev in thread] [next in thread]