Patch by Morgan Howe (slightly modified): Several changes to support

building on Mac OS X (Darwin). A problem with makebootable remains.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21165 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-05-18 15:59:04 +00:00
parent 354543fa8b
commit 6dcd0ccf23
13 changed files with 66 additions and 17 deletions
+9 -6
View File
@@ -22,7 +22,7 @@ USES_BE_API on $(tools) = true ;
BuildPlatformMain <build>catattr : catattr.cpp : $(HOST_LIBBE) ;
BuildPlatformMain <build>copyattr : copyattr.cpp
: $(HOST_LIBBE) $(HOST_LIBSTDC++) ;
: $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
BuildPlatformMain <build>listattr : listattr.cpp : $(HOST_LIBBE) ;
@@ -35,7 +35,7 @@ BuildPlatformMain <build>mimeset :
database_support.cpp
UpdateMimeInfoThread.cpp
MimeUpdateThread.cpp
: $(HOST_LIBBE)
: $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
;
BuildPlatformMain <build>mkindex : mkindex.cpp : $(HOST_LIBBE) ;
@@ -43,13 +43,16 @@ BuildPlatformMain <build>mkindex : mkindex.cpp : $(HOST_LIBBE) ;
BuildPlatformMain <build>rmattr : rmattr.cpp : $(HOST_LIBBE) ;
BuildPlatformMain <build>set_haiku_revision : set_haiku_revision.cpp
: $(HOST_LIBSTDC++) ;
: $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
BuildPlatformMain <build>settype : settype.cpp : $(HOST_LIBBE) ;
BuildPlatformMain <build>settype : settype.cpp : $(HOST_LIBBE)
$(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
BuildPlatformMain <build>setversion : setversion.cpp : $(HOST_LIBBE) ;
BuildPlatformMain <build>setversion : setversion.cpp : $(HOST_LIBBE)
$(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
BuildPlatformMain <build>xres : xres.cpp : $(HOST_LIBBE) $(HOST_LIBSTDC++) ;
BuildPlatformMain <build>xres : xres.cpp : $(HOST_LIBBE) $(HOST_LIBSTDC++)
$(HOST_LIBSUPC++) ;
SEARCH on [ FGristFiles
Mime.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ PreprocessSyscalls $(syscallsHeaderPP) : $(syscallsHeader) ;
BuildPlatformMain gensyscallinfos
: gensyscallinfos.cpp
: $(HOST_LIBSTDC++)
: $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
;
@@ -88,7 +88,7 @@ SubDirHdrs [ FDirName $(SUBDIR) arch $(TARGET_ARCH) ] ;
# build gensyscalls
BuildPlatformMain gensyscalls : gensyscalls.cpp $(syscallInfos) ;
LinkAgainst gensyscalls : $(HOST_LIBSTDC++) ;
LinkAgainst gensyscalls : $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
# Explicitly tell jam that gensyscalls.cpp includes the generated header.
Includes [ FGristFiles gensyscalls.cpp ] : $(syscallsHeaderPP) ;
+1
View File
@@ -7,6 +7,7 @@ USES_BE_API on <build>keymap = true ;
BuildPlatformMain <build>keymap :
main.cpp
Keymap.cpp
: $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
;
LinkAgainst <build>keymap : $(HOST_LIBBE) ;
@@ -23,5 +23,5 @@ AddFileDataResource <build>makebootable : RAWT:666:BootCode : stage1.bin ;
BuildPlatformMain <build>makebootable :
makebootable.cpp
$(hostPlatformSources)
: $(HOST_LIBBE)
: $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
;
+1 -1
View File
@@ -21,7 +21,7 @@ BuildPlatformMain <build>rc :
strlcat.c
;
LinkAgainst <build>rc
: <build>librdef.a $(HOST_LIBSTDC++) $(HOST_LIBBE) ;
: <build>librdef.a $(HOST_LIBSTDC++) $(HOST_LIBBE) $(HOST_LIBSUPC++) ;
SEARCH on [ FGristFiles
strlcat.c strlcpy.c
+1 -1
View File
@@ -3,5 +3,5 @@ SubDir HAIKU_TOP src tools resattr ;
USES_BE_API on <build>resattr = true ;
BuildPlatformMain <build>resattr : resattr.cpp ;
LinkAgainst <build>resattr : $(HOST_LIBBE) ;
LinkAgainst <build>resattr : $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;