Index: build/make-kit-macosx-amd64
==================================================================
--- build/make-kit-macosx-amd64
+++ build/make-kit-macosx-amd64
@@ -1,7 +1,13 @@
 #! /bin/sh
 
-CC='gcc -arch x86_64'
-CXX='g++ -arch x86_64'
-export CC CXX
-
-./build/make-kit-powermacg5 "$@" --enable-aqua --host=x86_64-apple-darwin9
+if [ "$(uname -s)" != 'Darwin' ]; then
+  ./build/make-kit-powermacg5 "$@" --enable-aqua --host=x86_64-apple-darwin9
+else
+  CC='gcc -arch x86_64'
+  CXX='g++ -arch x86_64'
+  export CC CXX
+  LDFLAGS='-headerpad_max_install_names -Wl,-search_paths_first'
+  CFLAGS='-O2 -DALLOW_EMPTY_EXPAND -arch x86_64 -arch i386 -pipe -fvisibility=hidden   -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.5'
+  export LDFLAGS CFLAGS
+  exec ./kitcreator "$@" --enable-aqua --enable-64bit --enable-corefoundation=yes --enable-framework=no
+fi

Index: tcl/build.sh
==================================================================
--- tcl/build.sh
+++ tcl/build.sh
@@ -202,25 +202,25 @@
 
 	tryfirstdir=''
 	case "${KC_CROSSCOMPILE_HOST_OS}" in
 		*-*-darwin*)
 			# Cross-compiling for Mac OS X -- try to build macosx directory first
-			tryfirstdir='macosx'
+			tryfirstdir='unix'
 			;;
 		*-*-*)
 			# Cross-compiling, do not assume based on build platform
 			;;
 		'')
 			# Not cross-compiling, assume based on build platform
 			if [ "$(uname -s)" = "Darwin" ]; then
 				# Compiling for Mac OS X, build in that directory first
-				tryfirstdir='macosx'
+				tryfirstdir='unix'
 			fi
 			;;
 	esac
 		
-	for dir in "${tryfirstdir}" unix win macosx __fail__; do
+	for dir in "${tryfirstdir}" unix win __fail__; do
 		if [ -z "${dir}" ]; then
 			continue
 		fi
 
 		if [ "${dir}" = "__fail__" ]; then

Index: tk/build.sh
==================================================================
--- tk/build.sh
+++ tk/build.sh
@@ -154,11 +154,11 @@
 	if [ -d 'fake-bin' ]; then
 		PATH="$(pwd)/fake-bin:${PATH}"
 		export PATH
 	fi
 
-	for dir in "${TCLCONFIGDIRTAIL}" unix win macosx win64 __fail__; do
+	for dir in "${TCLCONFIGDIRTAIL}" unix win win64 __fail__; do
 		if [ -z "${dir}" ]; then
 			continue
 		fi
 
 		if [ "${dir}" = "__fail__" ]; then