Changes In Branch osx_fixes Excluding Merge-Ins
This is equivalent to a diff from 4753676e99 to a61b7cb057
|
2015-05-29
| ||
| 17:08 | Fixed bug where dynamictk was always applied check-in: 360c2ef691 user: rkeene tags: trunk | |
|
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-05-11
| ||
| 20:42 | Fix hard-coded use of './kit' in the kitsh build script. check-in: 675f0fb1bf user: mistachkin tags: kitTargetNameFix | |
|
2015-04-02
| ||
| 21:31 | More work on the Mac OS X remote-build script check-in: 4753676e99 user: rkeene tags: trunk | |
| 21:25 | Fixed deletion of temporary directories for remote builds for Mac OS X check-in: fd476dce2a user: rkeene tags: trunk | |
Modified build/make-kit-macosx-amd64 from [17e09199c0] to [9e6ab0fa32].
1 2 | #! /bin/sh | > > > | | | | > > | > | 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 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 |
fi
done
tryfirstdir=''
case "${KC_CROSSCOMPILE_HOST_OS}" in
*-*-darwin*)
# Cross-compiling for Mac OS X -- try to build macosx directory first
| | | | | 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='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='unix'
fi
;;
esac
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 |
# Allow wrapper programs to supplant real programs
if [ -d 'fake-bin' ]; then
PATH="$(pwd)/fake-bin:${PATH}"
export PATH
fi
| | | 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 win64 __fail__; do
if [ -z "${dir}" ]; then
continue
fi
if [ "${dir}" = "__fail__" ]; then
exit 1
fi
|
| ︙ | ︙ |