45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
From 08bf7bde9f2987b1c623d272cc71fc14a1622442 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Liska <mliska@suse.cz>
|
||
|
|
Date: Fri, 28 Feb 2020 17:52:57 +0100
|
||
|
|
Subject: [PATCH] Improve detection of ld_date.
|
||
|
|
|
||
|
|
PR other/93965
|
||
|
|
* configure.ac: Improve detection of ld_date by requiring
|
||
|
|
either two dashes or none.
|
||
|
|
* configure: Regenerate.
|
||
|
|
---
|
||
|
|
gcc/ChangeLog | 7 +++++++
|
||
|
|
gcc/configure | 2 +-
|
||
|
|
gcc/configure.ac | 2 +-
|
||
|
|
3 files changed, 9 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gcc/configure b/gcc/configure
|
||
|
|
index f55cdb8c77f..5381e107bce 100755
|
||
|
|
--- a/gcc/configure
|
||
|
|
+++ b/gcc/configure
|
||
|
|
@@ -23384,7 +23384,7 @@ if test $in_tree_ld != yes ; then
|
||
|
|
ld_vers=`echo $ld_ver | sed -n \
|
||
|
|
-e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
|
||
|
|
fi
|
||
|
|
- ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
|
||
|
|
+ ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)\(-*\)\([01][0-9]\)\2\([0-3][0-9]\).*$,\1\3\4,p'`
|
||
|
|
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
|
||
|
|
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
|
||
|
|
ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
|
||
|
|
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||
|
|
index 0e6e475950d..0d6230e0ca1 100644
|
||
|
|
--- a/gcc/configure.ac
|
||
|
|
+++ b/gcc/configure.ac
|
||
|
|
@@ -2804,7 +2804,7 @@ if test $in_tree_ld != yes ; then
|
||
|
|
ld_vers=`echo $ld_ver | sed -n \
|
||
|
|
-e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
|
||
|
|
fi
|
||
|
|
- ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
|
||
|
|
+ ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)\(-*\)\([01][0-9]\)\2\([0-3][0-9]\).*$,\1\3\4,p'`
|
||
|
|
ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
|
||
|
|
ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
|
||
|
|
ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|