diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-08-13 09:57:51 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-08-13 09:57:51 +0000 |
| commit | 966bd9d19fb43b6a6022572eb7d80c1e03bfaf3e (patch) | |
| tree | aab09251badda3f7b1445359ab686eae01239969 /configure.ac | |
| parent | 62fe5c4a22453c763e967f04bda062df8241c487 (diff) | |
| download | guix-966bd9d19fb43b6a6022572eb7d80c1e03bfaf3e.tar.gz | |
* WTF? More canonical system name problems ("athlon-linux" instead of
"i686-linux").
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9bc3a0288a..0d7045de18 100644 --- a/configure.ac +++ b/configure.ac @@ -22,10 +22,20 @@ AC_CANONICAL_HOST # Construct a Nix system name (like "i686-linux"). AC_MSG_CHECKING([for the canonical Nix system name]) -machine_name=$(uname -p | tr 'A-Z ' 'a-z_') -if test "$machine_name" = "unknown"; then - machine_name=$(uname -m | tr 'A-Z ' 'a-z_') -fi +cpu_name=$(uname -p | tr 'A-Z ' 'a-z_') +machine_name=$(uname -m | tr 'A-Z ' 'a-z_') + +case $machine_name in + i*86) + machine_name=i686 + ;; + *) + if test "$cpu_name" != "unknown"; then + machine_name=$cpu_name + fi + ;; +esac + sys_name=$(uname -s | tr 'A-Z ' 'a-z_') AC_ARG_WITH(system, AC_HELP_STRING([--with-system=SYSTEM], [platform identifier (e.g., `i686-linux')]), |