projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
math: use '#pragma STDC FENV_ACCESS ON' when fenv is accessed
[musl]
/
configure
diff --git
a/configure
b/configure
index
19c241e
..
cee817e
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-50,15
+50,14
@@
fnmatch () { eval "case \"\$2\" in $1) return 0 ;; *) return 1 ;; esac" ; }
cmdexists () { type "$1" >/dev/null 2>&1 ; }
trycc () { test -z "$CC" && cmdexists "$1" && CC=$1 ; }
cmdexists () { type "$1" >/dev/null 2>&1 ; }
trycc () { test -z "$CC" && cmdexists "$1" && CC=$1 ; }
-setdir () {
-if eval "test -z \"\${$1}\"" ; then eval "$1=\$2"
-else eval "fnmatch '*/' \"\${$1}\"" && eval "$1=\${$1%/}" ; fi
+stripdir () {
+while eval "fnmatch '*/' \"\${$1}\"" ; do eval "$1=\${$1%/}" ; done
}
tryflag () {
printf "checking whether compiler accepts %s... " "$2"
echo "typedef int x;" > "$tmpc"
}
tryflag () {
printf "checking whether compiler accepts %s... " "$2"
echo "typedef int x;" > "$tmpc"
-if $CC "$2" -c -o /dev/null "$tmpc"
2>/dev/null
; then
+if $CC "$2" -c -o /dev/null "$tmpc"
>/dev/null 2>&1
; then
printf "yes\n"
eval "$1=\"\${$1} \$2\""
eval "$1=\${$1# }"
printf "yes\n"
eval "$1=\"\${$1} \$2\""
eval "$1=\${$1# }"
@@
-72,7
+71,7
@@
fi
tryldflag () {
printf "checking whether linker accepts %s... " "$2"
echo "typedef int x;" > "$tmpc"
tryldflag () {
printf "checking whether linker accepts %s... " "$2"
echo "typedef int x;" > "$tmpc"
-if $CC -nostdlib -shared "$2" -o /dev/null "$tmpc"
2>/dev/null
; then
+if $CC -nostdlib -shared "$2" -o /dev/null "$tmpc"
>/dev/null 2>&1
; then
printf "yes\n"
eval "$1=\"\${$1} \$2\""
eval "$1=\${$1# }"
printf "yes\n"
eval "$1=\"\${$1} \$2\""
eval "$1=\${$1# }"
@@
-90,15
+89,15
@@
fi
CFLAGS_C99FSE=
CFLAGS_AUTO=
LDFLAGS_AUTO=
CFLAGS_C99FSE=
CFLAGS_AUTO=
LDFLAGS_AUTO=
-prefix=
-exec_prefix=
-bindir=
-libdir=
-includedir=
-syslibdir=
+prefix=
/usr/local/musl
+exec_prefix=
'$(prefix)'
+bindir=
'$(exec_prefix)/bin'
+libdir=
'$(prefix)/lib'
+includedir=
'$(prefix)/include'
+syslibdir=
'/lib'
target=
debug=no
target=
debug=no
-warnings=
+warnings=
no
shared=yes
static=yes
shared=yes
static=yes
@@
-135,12
+134,9
@@
LIBCC=*) LIBCC=${arg#*=} ;;
esac
done
esac
done
-setdir prefix /usr/local/musl
-setdir exec_prefix '$(prefix)'
-setdir bindir '$(exec_prefix)/bin'
-setdir libdir '$(prefix)/lib'
-setdir includedir '$(prefix)/include'
-setdir syslibdir '/lib'
+for i in prefix exec_prefix bindir libdir includedir syslibdir ; do
+stripdir $i
+done
#
# Get a temp filename we can use
#
# Get a temp filename we can use
@@
-299,7
+295,8
@@
shared=no
# Find compiler runtime library
test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh
test -z "$LIBCC" && tryldflag LIBCC -lcompiler_rt
# Find compiler runtime library
test -z "$LIBCC" && tryldflag LIBCC -lgcc && tryldflag LIBCC -lgcc_eh
test -z "$LIBCC" && tryldflag LIBCC -lcompiler_rt
-test -z "$LIBCC" && tryldflag LIBCC -lpcc
+test -z "$LIBCC" && try_libcc=`$CC -print-file-name=libpcc.a 2>/dev/null` \
+ && tryldflag LIBCC "$try_libcc"
printf "using compiler runtime libraries: %s\n" "$LIBCC"
printf "using compiler runtime libraries: %s\n" "$LIBCC"