Check-in [a61b7cb057]
Overview
Comment:Fixes for building kits using Xcode tools on native OSX
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | osx_fixes
Files: files | file ages | folders
SHA1:a61b7cb0579d000d9a1c6c0a3bc2f60ff7f26cda
User & Date: hypnotoad on 2015-05-19 16:15:59
Other Links: manifest | tags
Context
2015-05-19
16:15
Fixes for building kits using Xcode tools on native OSX Leaf check-in: a61b7cb057 user: hypnotoad tags: osx_fixes
2015-04-02
21:31
More work on the Mac OS X remote-build script check-in: 4753676e99 user: rkeene tags: trunk
Changes

Modified build/make-kit-macosx-amd64 from [17e09199c0] to [9e6ab0fa32].

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

Modified tcl/build.sh from [a0fc7f495f] to [2446071b21].

   200    200   		fi
   201    201   	done
   202    202   
   203    203   	tryfirstdir=''
   204    204   	case "${KC_CROSSCOMPILE_HOST_OS}" in
   205    205   		*-*-darwin*)
   206    206   			# Cross-compiling for Mac OS X -- try to build macosx directory first
   207         -			tryfirstdir='macosx'
          207  +			tryfirstdir='unix'
   208    208   			;;
   209    209   		*-*-*)
   210    210   			# Cross-compiling, do not assume based on build platform
   211    211   			;;
   212    212   		'')
   213    213   			# Not cross-compiling, assume based on build platform
   214    214   			if [ "$(uname -s)" = "Darwin" ]; then
   215    215   				# Compiling for Mac OS X, build in that directory first
   216         -				tryfirstdir='macosx'
          216  +				tryfirstdir='unix'
   217    217   			fi
   218    218   			;;
   219    219   	esac
   220    220   		
   221         -	for dir in "${tryfirstdir}" unix win macosx __fail__; do
          221  +	for dir in "${tryfirstdir}" unix win __fail__; do
   222    222   		if [ -z "${dir}" ]; then
   223    223   			continue
   224    224   		fi
   225    225   
   226    226   		if [ "${dir}" = "__fail__" ]; then
   227    227   			# If we haven't figured out how to build it, reject.
   228    228   

Modified tk/build.sh from [bb348ac8e4] to [a1ade47162].

   152    152   
   153    153   	# Allow wrapper programs to supplant real programs
   154    154   	if [ -d 'fake-bin' ]; then
   155    155   		PATH="$(pwd)/fake-bin:${PATH}"
   156    156   		export PATH
   157    157   	fi
   158    158   
   159         -	for dir in "${TCLCONFIGDIRTAIL}" unix win macosx win64 __fail__; do
          159  +	for dir in "${TCLCONFIGDIRTAIL}" unix win win64 __fail__; do
   160    160   		if [ -z "${dir}" ]; then
   161    161   			continue
   162    162   		fi
   163    163   
   164    164   		if [ "${dir}" = "__fail__" ]; then
   165    165   			exit 1
   166    166   		fi