aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Howard <yzena.tech@gmail.com>2020-01-15 22:24:42 -0700
committerGavin Howard <yzena.tech@gmail.com>2020-01-15 22:24:42 -0700
commite5ac38e527fc5cafa9109c274b5ce4cccf04eeae (patch)
tree06faf73495659bdaf8888e15c3207ef062169175
parent2821eae2d1838aa2323adf26215677f32d810502 (diff)
downloadplatform_external_bc-e5ac38e527fc5cafa9109c274b5ce4cccf04eeae.tar.gz
platform_external_bc-e5ac38e527fc5cafa9109c274b5ce4cccf04eeae.tar.bz2
platform_external_bc-e5ac38e527fc5cafa9109c274b5ce4cccf04eeae.zip
Fix another problem in configure.sh
-rwxr-xr-xconfigure.sh50
1 files changed, 25 insertions, 25 deletions
diff --git a/configure.sh b/configure.sh
index 96b5917f..f62250d4 100755
--- a/configure.sh
+++ b/configure.sh
@@ -463,6 +463,30 @@ fi
set -e
+if [ -z "${LONG_BIT+set}" ]; then
+ LONG_BIT_DEFINE=""
+elif [ "$LONG_BIT" -lt 32 ]; then
+ usage "LONG_BIT is less than 32"
+else
+ LONG_BIT_DEFINE="-DBC_LONG_BIT=\$(BC_LONG_BIT)"
+fi
+
+if [ -z "${HOSTCFLAGS+set}" ] && [ -z "${HOST_CFLAGS+set}" ]; then
+ HOSTCFLAGS="$CFLAGS"
+elif [ -z "${HOSTCFLAGS+set}" ]; then
+ HOSTCFLAGS="$HOST_CFLAGS"
+fi
+
+if [ -z "$CC" ]; then
+ CC="c99"
+fi
+
+if [ -z "$HOSTCC" ] && [ -z "$HOST_CC" ]; then
+ HOSTCC="$CC"
+elif [ -z "$HOSTCC" ]; then
+ HOSTCC="$HOST_CC"
+fi
+
if [ "$loptions" -eq 1 ]; then
set +e
@@ -491,7 +515,7 @@ if [ "$loptions" -eq 1 ]; then
printf 'Forcing long options...\n'
fi
else
- printf 'Long options work.\n'
+ printf 'Long options work.\n\n'
fi
set -e
@@ -584,20 +608,6 @@ else
fi
-if [ -z "${LONG_BIT+set}" ]; then
- LONG_BIT_DEFINE=""
-elif [ "$LONG_BIT" -lt 32 ]; then
- usage "LONG_BIT is less than 32"
-else
- LONG_BIT_DEFINE="-DBC_LONG_BIT=\$(BC_LONG_BIT)"
-fi
-
-if [ -z "${HOSTCFLAGS+set}" ] && [ -z "${HOST_CFLAGS+set}" ]; then
- HOSTCFLAGS="$CFLAGS"
-elif [ -z "${HOSTCFLAGS+set}" ]; then
- HOSTCFLAGS="$HOST_CFLAGS"
-fi
-
if [ "$debug" -eq 1 ]; then
if [ -z "$CFLAGS" ] && [ -z "$optimization" ]; then
@@ -675,16 +685,6 @@ else
uninstall_man_prereqs=""
fi
-if [ -z "$CC" ]; then
- CC="c99"
-fi
-
-if [ -z "$HOSTCC" ] && [ -z "$HOST_CC" ]; then
- HOSTCC="$CC"
-elif [ -z "$HOSTCC" ]; then
- HOSTCC="$HOST_CC"
-fi
-
if [ "$nls" -ne 0 ]; then
set +e