RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix configure build/host/target terminology usage

This commit is contained in:
Rich Felker 2012-06-03 16:22:13 -04:00
parent 2557d0ba47
commit 278883d0e2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure vendored
View File

@ -2,7 +2,7 @@
usage () { usage () {
cat <<EOF cat <<EOF
Usage: $0 [OPTION]... [VAR=VALUE]... [BUILDTYPE] Usage: $0 [OPTION]... [VAR=VALUE]... [TARGET]
To assign environment variables (e.g., CC, CFLAGS...), specify them as To assign environment variables (e.g., CC, CFLAGS...), specify them as
VAR=VALUE. See below for descriptions of some of the useful variables. VAR=VALUE. See below for descriptions of some of the useful variables.
@ -21,7 +21,7 @@ Fine tuning of the installation directories:
System types: System types:
--target=TARGET configure to run on target TARGET [detected] --target=TARGET configure to run on target TARGET [detected]
--build=BUILD same as --target --host=HOST same as --target
Optional features: Optional features:
--enable-debug build with debugging information [disabled] --enable-debug build with debugging information [disabled]
@ -77,7 +77,7 @@ bindir=
libdir= libdir=
includedir= includedir=
syslibdir= syslibdir=
build= target=
debug=no debug=no
warnings= warnings=
shared=yes shared=yes
@ -102,14 +102,15 @@ case "$arg" in
--disable-warnings|--enable-warnings=no) warnings=no ;; --disable-warnings|--enable-warnings=no) warnings=no ;;
--enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ;; --enable-gcc-wrapper|--enable-gcc-wrapper=yes) wrapper=yes ;;
--disable-gcc-wrapper|--enable-gcc-wrapper=no) wrapper=no ;; --disable-gcc-wrapper|--enable-gcc-wrapper=no) wrapper=no ;;
--enable-*|--disable-*|--with-*|--without-*|--*dir=*|--host=*) ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*|--build=*) ;;
--build=*|--target=*) build=${arg#*=} ;; --host=*|--target=*) target=${arg#*=} ;;
-* ) echo "$0: unknown option $arg" ;; -* ) echo "$0: unknown option $arg" ;;
CC=*) CC=${arg#*=} ;; CC=*) CC=${arg#*=} ;;
CFLAGS=*) CFLAGS=${arg#*=} ;; CFLAGS=*) CFLAGS=${arg#*=} ;;
CPPFLAGS=*) CPPFLAGS=${arg#*=} ;; CPPFLAGS=*) CPPFLAGS=${arg#*=} ;;
LDFLAGS=*) LDFLAGS=${arg#*=} ;; LDFLAGS=*) LDFLAGS=${arg#*=} ;;
*) build=$arg ;; *=*) ;;
*) target=$arg ;;
esac esac
done done
@ -166,21 +167,21 @@ fi
# #
# Find the build architecture # Find the target architecture
# #
printf "checking build system type... " printf "checking target system type... "
test -n "$build" || build=$("$CC" -dumpmachine 2>/dev/null) || build=unknown test -n "$target" || target=$("$CC" -dumpmachine 2>/dev/null) || target=unknown
printf "%s\n" "$build" printf "%s\n" "$target"
# #
# Convert to just ARCH # Convert to just ARCH
# #
case "$build" in case "$target" in
arm*) ARCH=arm ;; arm*) ARCH=arm ;;
i?86*) ARCH=i386 ;; i?86*) ARCH=i386 ;;
x86_64*) ARCH=x86_64 ;; x86_64*) ARCH=x86_64 ;;
unknown) fail "$0: unable to detect built target; try $0 --build=..." ;; unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;;
*) fail "$0: unknown or unsupported build target \"$build\"" ;; *) fail "$0: unknown or unsupported target \"$target\"" ;;
esac esac
# #