[haiku-commits] haiku: hrev54471 - src/system/libroot build/jam/packages

  • From: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 28 Jul 2020 13:01:18 -0400 (EDT)

hrev54471 adds 1 changeset to branch 'master'
old head: 6a40fd892cbcf202c57a3f412738f410f26d4cac
new head: 6f92b552f352b45039c940c31fcd51486b811cb6
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=6f92b552f352+%5E6a40fd892cbc

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

6f92b552f352: libroot: Add fake libc static library
  
  * It's specified in POSIX: 
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html
  * wine hardcodes a -lc in its winegcc compiler
  
  Change-Id: I592b62085787d8f1a1ead2df32e978a91ab03ea9
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/3086
  Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

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

Revision:    hrev54471
Commit:      6f92b552f352b45039c940c31fcd51486b811cb6
URL:         https://git.haiku-os.org/haiku/commit/?id=6f92b552f352
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sat Jul 25 14:57:51 2020 UTC
Committer:   Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Tue Jul 28 17:01:13 2020 UTC

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

3 files changed, 4 insertions(+), 1 deletion(-)
build/jam/packages/HaikuDevel          | 2 +-
build/jam/packages/HaikuDevelSecondary | 1 +
src/system/libroot/Jamfile             | 2 ++

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

diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel
index 0bae52501b..407aabbf55 100644
--- a/build/jam/packages/HaikuDevel
+++ b/build/jam/packages/HaikuDevel
@@ -39,7 +39,7 @@ for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 
 # static libraries
 AddFilesToPackage develop lib :
-       libcolumnlistview.a
+       libc.a libcolumnlistview.a
        <$(architecture)>liblocalestub.a
        libm.a libpthread.a
        libprint.a libprintutils.a
diff --git a/build/jam/packages/HaikuDevelSecondary 
b/build/jam/packages/HaikuDevelSecondary
index f0132c94e0..042b1e6b85 100644
--- a/build/jam/packages/HaikuDevelSecondary
+++ b/build/jam/packages/HaikuDevelSecondary
@@ -34,6 +34,7 @@ for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 
 # static libraries
 AddFilesToPackage develop lib $(architecture) :
+       <$(architecture)>libc.a
        <$(architecture)>libcolumnlistview.a
        <$(architecture)>liblocalestub.a
        <$(architecture)>libm.a
diff --git a/src/system/libroot/Jamfile b/src/system/libroot/Jamfile
index 9c2cd6ded9..1297bb1fc1 100644
--- a/src/system/libroot/Jamfile
+++ b/src/system/libroot/Jamfile
@@ -101,6 +101,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
                        [ TargetLibgcc ]
                        ;
 
+               # These are defined in POSIX for c99 support, so fake'em
+               StaticLibrary [ MultiArchDefaultGristFiles libc.a ] : empty.c ;
                StaticLibrary [ MultiArchDefaultGristFiles libm.a ] : empty.c ;
                StaticLibrary [ MultiArchDefaultGristFiles libpthread.a ] : 
empty.c ;
 


Other related posts:

  • » [haiku-commits] haiku: hrev54471 - src/system/libroot build/jam/packages - Alex von Gluck IV