diff options
author | Hans-Peter Nilsson <hp@axis.com> | 2008-04-12 18:53:52 +0000 |
---|---|---|
committer | Hans-Peter Nilsson <hp@axis.com> | 2008-04-12 18:53:52 +0000 |
commit | 433f1f8930f83e5231e072926e4e81d4f3389495 (patch) | |
tree | 988150846244b38fb6d74f37511d18fbca45e687 | |
parent | 467078e9468eab6e8a5263142ea42a7f26ec3741 (diff) | |
download | gdb-433f1f8930f83e5231e072926e4e81d4f3389495.tar.gz |
* Makefile.tpl <gcc>: Error early unless at least GNU make 3.80.
* Makefile.in: Regenerate.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 8 | ||||
-rw-r--r-- | Makefile.tpl | 8 |
3 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 1502ace6852..1023921c464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-12 Hans-Peter Nilsson <hp@axis.com> + + * Makefile.tpl <gcc>: Error early unless at least GNU make 3.80. + * Makefile.in: Regenerate. + 2008-04-07 Ian Lance Taylor <iant@google.com> * Makefile.def: check-gold depends upon all-binutils. diff --git a/Makefile.in b/Makefile.in index edd2984fce4..dc3b0c5569a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# First, test for a proper version of make, but only where one is required. + +@if gcc +ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty. +$(error GNU make version 3.80 or newer is required.) +endif +@endif gcc + # ------------------------------- # Standard Autoconf-set variables # ------------------------------- diff --git a/Makefile.tpl b/Makefile.tpl index 95441f5bc43..e9629e2da2c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -23,6 +23,14 @@ in # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# First, test for a proper version of make, but only where one is required. + +@if gcc +ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty. +$(error GNU make version 3.80 or newer is required.) +endif +@endif gcc + # ------------------------------- # Standard Autoconf-set variables # ------------------------------- |