Changeset 557 for trunk/kBuild

Timestamp:

Sep 28, 2006, 5:56:25 PM (19 years ago)

Author:

bird

Message:

Initial Mac OS X / Darwin bootstrapping.

Location:

trunk/kBuild

Files:

• bin/x86.darwin (added)
• bin/x86.darwin/kDepIDB (added)
• bin/x86.darwin/kDepPre (added)
• bin/x86.darwin/kmk (added)
• bin/x86.darwin/kmk_append (added)
• bin/x86.darwin/kmk_ash (added)
• bin/x86.darwin/kmk_cat (added)
• bin/x86.darwin/kmk_cp (added)
• bin/x86.darwin/kmk_echo (added)
• bin/x86.darwin/kmk_gmake (added)
• bin/x86.darwin/kmk_install (added)
• bin/x86.darwin/kmk_ln (added)
• bin/x86.darwin/kmk_mkdir (added)
• bin/x86.darwin/kmk_mv (added)
• bin/x86.darwin/kmk_rm (added)
• bin/x86.darwin/kmk_sed (added)
• env.sh (modified) (2 diffs)
• header.kmk (modified) (4 diffs)
• tools/GCC3.kmk (modified) (1 diff)
• tools/GCC4MACH.kmk (added)

trunk/kBuild/env.sh

@@ -29 +29 @@
 # kBuild path.
 if [ -z "$PATH_KBUILD" ]; then
-    if which realpath > /dev/null 2>&1; then
-        PATH_KBUILD=`realpath $0`
-    else
-        PATH_KBUILD=`readlink -f $0`
-    fi
-    PATH_KBUILD=`dirname "$PATH_KBUILD"`
+    PATH_KBUILD=`dirname "$0"`
+    PATH_KBUILD=`cd "$PATH_KBUILD" ; /bin/pwd`
 fi
 if [ ! -f "$PATH_KBUILD/footer.kmk" -o ! -f "$PATH_KBUILD/header.kmk" -o ! -f "$PATH_KBUILD/rules.kmk" ]; then
@@ -104 +100 @@
         netbsd|NetBSD|NETBSD)
             BUILD_PLATFORM=netbsd
+            ;;
+
+        Darwin|darwin)
+            BUILD_PLATFORM=darwin
             ;;
 

trunk/kBuild/header.kmk

@@ -104 +104 @@
 else
  BUILD_PLATFORM     := $(strip $(BUILD_PLATFORM))
- ifneq ($(words $(BUILD_PLATFORM))$(filter-out freebsd l4 linux nt os2 win win32 win64,$(BUILD_PLATFORM)),1)
+ ifneq ($(words $(BUILD_PLATFORM))$(filter-out darwin freebsd l4 linux nt os2 win win32 win64,$(BUILD_PLATFORM)),1)
   # OS/2 (have uppercase legacy)
   ifeq ($(BUILD_PLATFORM),OS2)
@@ -138 +138 @@
 else
  BUILD_TARGET       := $(strip $(BUILD_TARGET))
- ifneq ($(words $(BUILD_TARGET))$(filter-out freebsd l4 linux nt os2 win win32 win64,$(BUILD_TARGET)),1)
+ ifneq ($(words $(BUILD_TARGET))$(filter-out darwin freebsd l4 linux nt os2 win win32 win64,$(BUILD_TARGET)),1)
   # OS/2 (have uppercase legacy)
   ifeq ($(BUILD_TARGET),OS2)
@@ -248 +248 @@
 HOSTSUFF_EXE        :=
 endif
+
+# Darwin / Mac OS X
+ifeq ($(BUILD_PLATFORM),darwin)
+EXEC_X86_WIN32      := false
+HOSTSUFF_EXE        :=
+endif
+
 
 PATH_TOOLS          := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
@@ -285 +292 @@
 SUFF_RES            :=
 endif
+ifeq ($(BUILD_TARGET),darwin)
+SUFF_OBJ            := .o
+SUFF_LIB            := .a
+SUFF_DLL            := .dylib
+SUFF_EXE            :=
+SUFF_SYS            := .a
+SUFF_RES            :=
+endif
 ifndef SUFF_OBJ
 SUFF_OBJ            := .o

trunk/kBuild/tools/GCC3.kmk

@@ -74 +74 @@
 ifeq ($(BUILD_TARGET),os2)
 TOOL_GCC3_LD_MAP              = -Zmap=$(1)
+TOOL_GCC3_LD_SYSMOD_MAP       = -Zmap=$(1)
 else
 TOOL_GCC3_LD_MAP              = -Wl,-Map -Wl,$(1) -Wl,--cref
-endif
-ifeq ($(BUILD_TARGET),os2)
-TOOL_GCC3_LD_SYSMOD_MAP       = -Zmap=$(1)
-else
 TOOL_GCC3_LD_SYSMOD_MAP       = -Map $(1) --cref
 endif