diff options
| author | Roland McGrath <roland@gnu.org> | 1995-04-19 22:12:34 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-04-19 22:12:34 +0000 |
| commit | 82d00cabd4ffa1adce116b877a482641f99e8ce7 (patch) | |
| tree | 1d33aca1f729bd7e792dde07fed58b050e834d3e /configure.in | |
| parent | b948be77ef089246e916d29225b68f42133be744 (diff) | |
| download | glibc-82d00cabd4ffa1adce116b877a482641f99e8ce7.tar glibc-82d00cabd4ffa1adce116b877a482641f99e8ce7.tar.gz glibc-82d00cabd4ffa1adce116b877a482641f99e8ce7.tar.bz2 glibc-82d00cabd4ffa1adce116b877a482641f99e8ce7.zip | |
Move $os tests to set $elf et al earlier, before construction of $sysnames. Instead of prepending MACHINE/elf to $sysnames, append &/elf after each elt appended to $mach.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/configure.in b/configure.in index 16f5b7b990..11f57c9f9f 100644 --- a/configure.in +++ b/configure.in @@ -108,6 +108,19 @@ none) base_os='' ;; esac +# Some configurations imply other options. +case "$os" in +gnu* | linux* | bsd4.4* | netbsd* | freebsd*) + # These systems always use GNU tools. + gnu_ld=yes gnu_as=yes +esac +case "$os" in +gnu*elf* | linux* | sysv4* | solaris2*) + # These systems always use the ELF format. + elf=yes +esac + + # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos. tail=$os ostry=$os @@ -134,6 +147,10 @@ mach= tail=$machine while m=`echo $tail | sed 's@^\(.*\)/\([^/]*\)$@& \1@'`; test -n "$m"; do set $m + # If using ELF, look for an `elf' subdirectory of each machine directory. + if test "$elf" = yes; then + mach="$mach /$1/elf" + fi mach="$mach /$1" tail="$2" done @@ -169,18 +186,6 @@ fi # We have now validated the configuration. -# Some configurations imply other options. -case "$host_os" in -gnu* | linux* | bsd4.4* | netbsd* | freebsd*) - # These systems always use GNU tools. - gnu_ld=yes gnu_as=yes -esac -case "$host_os" in -gnu*elf* | linux* | sysv4* | solaris2*) - # These systems always use the ELF format. - elf=yes -esac - # Remove the leading slashes. sysnames="`echo $sysnames | sed -e 's@^/@@' -e 's@ /@ @g'`" @@ -196,17 +201,6 @@ if test "$with_fp" = yes; then sysnames="`echo $fpu_dirs | sed -e 's,^/,,' -e 's, /,,g'` $sysnames" fi -# If using ELF, prepend the machine-specific ELF ABI directory. -if test "$elf" = yes; then - elf_dirs= - for m in $mach; do - if test -d $sysdep_dir$m/elf; then - elf_dirs="elf_dirs $m/elf" - fi - done - sysnames="`echo elf_dirs | sed -e 's,^/,,' -e 's, /,,g'` $sysnames" -fi - # Expand the list of system names into a full list of directories |