KitCreator
Check-in [a61b7cb057]
Login
HomeDownloadsSource CodeTicketsWiki
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: branch diff | 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
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

1
2



3
4
5
6
7









1
2
3
4
5





6
7
8
9
10
11
12
13



+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+

#! /bin/sh

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

./build/make-kit-powermacg5 "$@" --enable-aqua --host=x86_64-apple-darwin9
  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

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

︙
200
201
202
203
204
205
206
207

208
209
210
211
212
213
214
215
216

217
218
219
220
221

222
223
224
225
226
227
228

200
201
202
203
204
205
206

207
208
209
210
211
212
213
214
215

216
217
218
219
220

221
222
223
224
225
226
227
228








-
+








-
+




-
+








		fi
	done

	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
			# If we haven't figured out how to build it, reject.
︙

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

︙
152
153
154
155
156
157
158
159

160
161
162
163
164
165
166

152
153
154
155
156
157
158

159
160
161
162
163
164
165
166








-
+









	# Allow wrapper programs to supplant real programs
	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
			exit 1
		fi
︙

Powered by Fossil · RSS