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

build/jam/BuildSetup

@@ -335,9 +335,11 @@ HOST_AR				= $(HOST_AR[1]) ;
 HOST_UNARFLAGS		?= x ;
 
 # check the host platform compatibility
-SetPlatformCompatibilityFlagVariables HOST_PLATFORM : HOST : host : linux freebsd ;
+SetPlatformCompatibilityFlagVariables HOST_PLATFORM : HOST : host
+	: linux freebsd darwin ;
 
-if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd {
+if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
+	|| $(HOST_PLATFORM) = darwin {
 	# don't use lex: otherwise rc will not work correctly
 	if $(LEX) = lex {
 		LEX = flex ;
@@ -404,6 +406,7 @@ switch $(HOST_PLATFORM) {
 	case haiku	: HOST_DEBUG_FLAGS ?= -ggdb ;
 	case linux	: HOST_DEBUG_FLAGS ?= -ggdb ;
 	case freebsd    : HOST_DEBUG_FLAGS ?= -ggdb ;
+	case darwin : HOST_DEBUG_FLAGS ?= -ggdb ;
 	case *		: HOST_DEBUG_FLAGS ?= -g ;
 }
 
@@ -465,10 +468,17 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 		HOST_LIBSUPC++ = supc++ ;
 	}
 
+	if $(HOST_PLATFORM) = darwin {
+		HOST_LIBSUPC++ = gcc_s.1 ;
+	}
+
 	# Unlike glibc FreeBSD's libc doesn't have built-in regex support.
 	if $(HOST_PLATFORM) = freebsd {
 		HOST_LIBROOT += /usr/lib/libgnuregex.so ;
+	} else if $(HOST_PLATFORM) = darwin {
+		HOST_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
 	}
+  
 
 	# The BeOS compilers define __INTEL__ respectively __POWERPC__. On the
 	# build platform we need to make sure, this is also defined.
@@ -635,6 +645,7 @@ switch $(TARGET_PLATFORM) {
 	case haiku		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_HAIKU ;
 	case linux		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LINUX ;
 	case freebsd	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_FREEBSD ;
+	case darwin		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_DARWIN ;
 	case libbe_test	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LIBBE_TEST ;
 }
 
@@ -646,6 +657,7 @@ switch $(HOST_PLATFORM) {
 	case haiku		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_HAIKU ;
 	case linux		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_LINUX ;
 	case freebsd	: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_FREEBSD ;
+	case darwin		: HOST_DEFINES	+= HAIKU_HOST_PLATFORM_DARWIN ;
 }
 
 

build/jam/MainBuildRules

@@ -457,8 +457,14 @@ rule BuildPlatformSharedLibrary
 	local libs = $(3) ;
 	
 	BuildPlatformMain $(target) : $(sources) : $(libs) ;
-	LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
-		-shared -Xlinker -soname=\"$(target:G=)\" ;
+
+	if $(HOST_PLATFORM) = darwin {
+		LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
+			-dynamic -dynamiclib -Xlinker -flat_namespace ;
+	} else {
+		LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
+			-shared -Xlinker -soname=\"$(target:G=)\" ;
+	}
 }
 
 rule BuildPlatformMergeObject

build/scripts/build_haiku_image

@@ -56,7 +56,7 @@ if [ $isImage ]; then
 	echo
 	if [ ! $updateOnly ]; then
 		echo "Creating image ..."
-		dd if=/dev/zero of=$imagePath bs=1M count=$imageSize
+		dd if=/dev/zero of=$imagePath bs=1048576 count=$imageSize
 		$bfsShell --initialize $imagePath Haiku
 		$makebootable $imagePath
 	fi