aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-10-10 18:15:03 +0000
committerIan Lance Taylor <ian@airs.com>1996-10-10 18:15:03 +0000
commit3274332f90b562961cbfdd833fe2a6ed5f340b72 (patch)
tree3de1aa28e20d633ded447de94376d558730bdce3
parent1c3ae169f7f139c29c737b8c25aee43e8ac752dd (diff)
downloadgdb-3274332f90b562961cbfdd833fe2a6ed5f340b72.zip
gdb-3274332f90b562961cbfdd833fe2a6ed5f340b72.tar.gz
gdb-3274332f90b562961cbfdd833fe2a6ed5f340b72.tar.bz2
* configure: Don't get confused by CPU-VENDOR-linux-gnu.
-rw-r--r--ChangeLog2
-rwxr-xr-xconfigure24
2 files changed, 14 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index ccf96c9..edd830b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Thu Oct 10 10:37:17 1996 Stan Shebs <shebs@andros.cygnus.com>
Thu Oct 10 12:30:54 1996 Ian Lance Taylor <ian@cygnus.com>
+ * configure: Don't get confused by CPU-VENDOR-linux-gnu.
+
* configure: Rework yesterday's sed script patch.
* config.sub: Merge with FSF.
diff --git a/configure b/configure
index 0af67ed..83a3bf9 100755
--- a/configure
+++ b/configure
@@ -573,9 +573,9 @@ esac
case "${build_alias}" in
"")
if result=`${config_shell} ${configsub} ${host_alias}` ; then
- build_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
- build_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
- build_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+ build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
build=${build_cpu}-${build_vendor}-${build_os}
build_alias=${host_alias}
fi
@@ -583,9 +583,9 @@ case "${build_alias}" in
*)
if result=`${config_shell} ${configsub} ${build_alias}` ; then
buildopt="--build=${build_alias}"
- build_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
- build_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
- build_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+ build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
build=${build_cpu}-${build_vendor}-${build_os}
else
echo "Unrecognized build system name ${build_alias}." 1>&2
@@ -600,9 +600,9 @@ else
echo "Unrecognized host system name ${host_alias}." 1>&2
exit 1
fi
-host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
host=${host_cpu}-${host_vendor}-${host_os}
. ${tmpfile}.hst
@@ -613,9 +613,9 @@ else
echo "Unrecognized target system name ${target_alias}." 1>&2
exit 1
fi
-target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+target_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
target=${target_cpu}-${target_vendor}-${target_os}
. ${tmpfile}.tgt