Skip to content

Commit 317a358

Browse files
author
Michael Ledford
committed
Moved asking for the architecture to build inside of the check for Darwin if block. This is because clang only supports -arch on Darwin (Mac OS X) systems currently.
1 parent 345eddd commit 317a358

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

lib/configure

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@ if [ `uname` == "Darwin" ] ; then
3434
done
3535
echo "XCODE_SDK := $SDK_CHOICE" >> config.mk
3636
fi
37-
fi
38-
39-
if contains_flag ARCH; then
40-
ARCH=`grep -oE 'ARCH := [^#]+' config.mk | cut -b9-`
41-
else
42-
DEFAULT_ARCH=$(uname -m)
43-
if [[ $XCODE_SDK == iphoneos* ]] ; then
44-
DEFAULT_ARCH='armv7s'
45-
fi
37+
38+
if contains_flag ARCH; then
39+
ARCH=`grep -oE 'ARCH := [^#]+' config.mk | cut -b9-`
40+
else
41+
DEFAULT_ARCH=$(uname -m)
42+
if [[ $XCODE_SDK == iphoneos* ]] ; then
43+
DEFAULT_ARCH='armv7s'
44+
fi
4645

47-
echo -ne " Default architecture: \033[4m$DEFAULT_ARCH\033[m [Y/n] ? "
48-
read -n 1 yn ; if [ ! -z $yn ] ; then echo ; fi
49-
case $yn in
50-
[nN]* ) read -p " Your architecture: " CC
51-
;;
52-
* ) ARCH=$DEFAULT_ARCH
53-
;;
54-
esac
55-
echo "ARCH := $ARCH" >> config.mk
46+
echo -ne " Default architecture: \033[4m$DEFAULT_ARCH\033[m [Y/n] ? "
47+
read -n 1 yn ; if [ ! -z $yn ] ; then echo ; fi
48+
case $yn in
49+
[nN]* ) read -p " Your architecture: " CC
50+
;;
51+
* ) ARCH=$DEFAULT_ARCH
52+
;;
53+
esac
54+
echo "ARCH := $ARCH" >> config.mk
55+
fi
5656
fi
5757

5858
if contains_flag CC; then

0 commit comments

Comments
 (0)