diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-03-19 18:22:13 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-03-19 18:22:13 +0000 |
| commit | a7d962c0c5e35297e13d12ad2168f456d303ae88 (patch) | |
| tree | 237f70f67b7c20dcb7513f8e2423d156e0619204 /configure | |
| parent | d18999790c462bc780bff457e6bb03cd88e488f3 (diff) | |
| download | s6-linux-utils-a7d962c0c5e35297e13d12ad2168f456d303ae88.tar.gz s6-linux-utils-a7d962c0c5e35297e13d12ad2168f456d303ae88.tar.xz s6-linux-utils-a7d962c0c5e35297e13d12ad2168f456d303ae88.zip | |
More standard cross-compilation support (only --host, no --enable-cross needed)
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/configure b/configure index 3378c99..ab7279f 100755 --- a/configure +++ b/configure @@ -43,7 +43,6 @@ Optional features: --disable-allstatic do not prefer linking against static libraries [enabled] --enable-static-libc make entirely static binaries [disabled] --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] - --enable-cross=CROSS prefix toolchain executable names with CROSS [none] EOF exit 0 @@ -150,7 +149,7 @@ addlibspath='' addlibdpath='' vpaths='' vpathd='' -cross="$CROSS_COMPILE" +build= for arg ; do case "$arg" in @@ -179,11 +178,9 @@ for arg ; do --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;; --enable-slashpackage) sproot= ; slashpackage=true ;; --disable-slashpackage) sproot= ; slashpackage=false ;; - --enable-cross=*) cross=${arg#*=} ;; - --enable-cross) ;; - --disable-cross) cross= ;; - --enable-*|--disable-*|--with-*|--without-*|--*dir=*|--build=*) ;; + --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; + --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; *=*) ;; *) target=$arg ;; @@ -252,6 +249,11 @@ if $slashpackage ; then fi # Find a C compiler to use +if test -n "$target" && test x${build} != x${target} ; then + cross=${target}- +else + cross= +fi echo "checking for C compiler..." trycc ${cross}${CC} trycc ${cross}gcc @@ -270,7 +272,13 @@ else fi echo "checking target system type..." -test -n "$target" || target=$($CC_AUTO -dumpmachine 2>/dev/null) || target=unknown +if test -z "$target" ; then + if test -n "$build" ; then + target=$build ; + else + target=$($CC_AUTO -dumpmachine 2>/dev/null) || target=unknown + fi +fi echo " ... $target" if test ! -d $sysdeps || test ! -f $sysdeps/target ; then echo "$0: error: $sysdeps is not a valid sysdeps directory" |