Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a case for 64-bit OS X in config #1053

Closed
wants to merge 2 commits into from
Closed

Add a case for 64-bit OS X in config #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f7c73
Add a case for 64-bit OS X in config
levitte May 10, 2016
35fd2a3
Add note in CHANGES (to be squashed)
levitte May 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@

Changes between 1.0.2g and 1.1.0 [xx XXX xxxx]

*) Automatic Darwin/OSX configuration has had a refresh, it will now
recognise x86_64 architectures automatically. You can still decide
to build for a different bitness with the environment variable
KERNEL_BITS (can be 32 or 64), for example:

KERNEL_BITS=32 ./config

[Richard Levitte]

*) Remove support for MIPS o32 ABI on IRIX (and IRIX only).
[Andy Polyakov]

Expand Down
21 changes: 20 additions & 1 deletion config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
Power*)
echo "ppc-apple-darwin${VERSION}"
;;
x86_64)
echo "x86_64-apple-darwin${VERSION}"
;;
*)
echo "i686-apple-darwin${VERSION}"
;;
Expand Down Expand Up @@ -503,7 +506,7 @@ case "$GUESSOS" in
ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure darwin64-x86_64-cc $options' *manually*."
echo " invoke 'KERNEL_BITS=64 $THERE/config $options'."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
# The stty technique used elsewhere doesn't work on
Expand All @@ -516,6 +519,22 @@ case "$GUESSOS" in
else
OUT="darwin-i386-cc"
fi ;;
x86_64-apple-darwin*)
if [ -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 32-bit library, then you have to"
echo " invoke 'KERNEL_BITS=32 $THERE/config $options'."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
# The stty technique used elsewhere doesn't work on
# MacOS. At least, right now on this Mac.
sleep 5
fi
fi
if [ "$KERNEL_BITS" = "32" ]; then
OUT="darwin-i386-cc"
else
OUT="darwin64-x86_64-cc"
fi ;;
armv6+7-*-iphoneos)
options="$options -arch%20armv6 -arch%20armv7"
OUT="iphoneos-cross" ;;
Expand Down