[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] Change in haiku[master]: efi: Don't skip TargetBootLibgcc, we need it for 32-bit fp
From: Gerrit <review () review ! haiku-os ! org>
Date: 2020-02-26 16:13:40
Message-ID: gerrit.1582733618000.I23db3cbb57fea1f9346db9477f72bcc164794926 () review ! haiku-os ! org
[Download RAW message or body]
From Alex von Gluck IV <kallisti5@unixzen.com>:
Alex von Gluck IV has uploaded this change for review. ( https://review.haiku-os.org/c/haiku/+/2282 )
Change subject: efi: Don't skip TargetBootLibgcc, we need it for 32-bit fp math
......................................................................
efi: Don't skip TargetBootLibgcc, we need it for 32-bit fp math
Change-Id: I23db3cbb57fea1f9346db9477f72bcc164794926
---
M build/jam/BootRules
1 file changed, 6 insertions(+), 8 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/82/2282/1
diff --git a/build/jam/BootRules b/build/jam/BootRules
index 6095e9d..61761cf 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -125,15 +125,13 @@
# 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.
--
To view, visit https://review.haiku-os.org/c/haiku/+/2282
To unsubscribe, or for help writing mail filters, visit https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I23db3cbb57fea1f9346db9477f72bcc164794926
Gerrit-Change-Number: 2282
Gerrit-PatchSet: 1
Gerrit-Owner: Alex von Gluck IV <kallisti5@unixzen.com>
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>Alex von Gluck IV has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/2282">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">efi: Don't skip \
TargetBootLibgcc, we need it for 32-bit fp math<br><br>Change-Id: \
I23db3cbb57fea1f9346db9477f72bcc164794926<br>---<br>M build/jam/BootRules<br>1 file \
changed, 6 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: \
monospace,monospace; white-space: pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku \
refs/changes/82/2282/1</pre><pre style="font-family: monospace,monospace; \
white-space: pre-wrap;"><span>diff --git a/build/jam/BootRules \
b/build/jam/BootRules</span><br><span>index 6095e9d..61761cf \
100644</span><br><span>--- a/build/jam/BootRules</span><br><span>+++ \
b/build/jam/BootRules</span><br><span>@@ -125,15 +125,13 @@</span><br><span> \
</span><br><span> # Remove any preset LINKLIBS, but link against libgcc.a. Linking \
against</span><br><span> # libsupc++ is opt-out.</span><br><span style="color: \
hsl(0, 100%, 40%);">- if $(TARGET_BOOT_PLATFORM) != efi {</span><br><span \
style="color: hsl(0, 100%, 40%);">- local libs ;</span><br><span style="color: \
hsl(0, 100%, 40%);">- if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] \
{</span><br><span style="color: hsl(0, 100%, 40%);">- libs += [ TargetBootLibsupc++ \
true ] ;</span><br><span style="color: hsl(0, 100%, 40%);">- Depends $(1) : [ \
TargetBootLibsupc++ ] ;</span><br><span style="color: hsl(0, 100%, \
40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- LINKLIBS on $(1) = \
$(libs) [ TargetBootLibgcc true ] ;</span><br><span style="color: hsl(0, 100%, \
40%);">- Depends $(1) : [ TargetBootLibgcc ] ;</span><br><span style="color: \
hsl(120, 100%, 40%);">+ local libs ;</span><br><span style="color: hsl(120, 100%, \
40%);">+ if ! [ on $(1) return $(HAIKU_NO_LIBSUPC++) ] {</span><br><span \
style="color: hsl(120, 100%, 40%);">+ libs += [ TargetBootLibsupc++ true ] \
;</span><br><span style="color: hsl(120, 100%, 40%);">+ Depends $(1) : [ \
TargetBootLibsupc++ ] ;</span><br><span> }</span><br><span style="color: hsl(120, \
100%, 40%);">+ LINKLIBS on $(1) = $(libs) [ TargetBootLibgcc true ] ;</span><br><span \
style="color: hsl(120, 100%, 40%);">+ Depends $(1) : [ TargetBootLibgcc ] \
;</span><br><span> </span><br><span> # TODO: Do we really want to invoke SetupBoot \
here? The objects should</span><br><span> # have been compiled with BootObjects \
anyway, so we're doing that twice.</span><br><span></span><br></pre><p>To view, \
visit <a href="https://review.haiku-os.org/c/haiku/+/2282">change 2282</a>. To \
unsubscribe, or for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/2282"/><meta itemprop="name" \
content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I23db3cbb57fea1f9346db9477f72bcc164794926 </div> <div style="display:none"> \
Gerrit-Change-Number: 2282 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: Alex von Gluck IV \
<kallisti5@unixzen.com> </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic