diff options
| author | apb <apb@NetBSD.org> | 2013-08-06 21:47:01 +0000 |
|---|---|---|
| committer | apb <apb@NetBSD.org> | 2013-08-06 21:47:01 +0000 |
| commit | 199a4fedb4740980fe2254c846e3b2ffc4fa18fc (patch) | |
| tree | 7eafe48a3fdf63628971c9f405627c422e9fd3dd | |
| parent | 2b8e5d7a5a4c5f28d94d6ed2acdac8a157232f59 (diff) | |
Add the "-g -D__gnu__" flags when invoking M4 via CONFIGURE_ARGS
in tools/Makefile.gnuhost. This makes the tools version of m4
behave like GNU m4.
Remove similar code from tools/autoconf/Makefile, where it didn't
work because Makefile.gnuhost would previously have overridden it.
This fixes a problem in which the tools version of autoconf complained
"M4sugar requires GNU M4.
Install it before installing M4sugar or set the M4 environment variable to its path name."
| -rw-r--r-- | tools/Makefile.gnuhost | 4 | ||||
| -rw-r--r-- | tools/autoconf/Makefile | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/Makefile.gnuhost b/tools/Makefile.gnuhost index 4428454c1d4..9a821f2442d 100644 --- a/tools/Makefile.gnuhost +++ b/tools/Makefile.gnuhost @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.gnuhost,v 1.39 2012/06/19 21:48:33 hans Exp $ +# $NetBSD: Makefile.gnuhost,v 1.40 2013/08/06 21:47:01 apb Exp $ # # Rules used when building a GNU host package. Expects MODULE to be set. # @@ -56,7 +56,7 @@ CONFIGURE_ENV+= \ INSTALL=${HOST_INSTALL_FILE:Q} \ LDFLAGS=${HOST_LDFLAGS:Q} \ LEX=${LEX:Q} \ - M4=${TOOL_M4:Q} \ + M4=${TOOL_M4:Q}" -g -D__gnu__" \ MAKE=${MAKE_PROGRAM:Q} \ PATH="${TOOLDIR}/bin:$$PATH" \ RANLIB=${HOST_RANLIB:Q} \ diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile index 608c56450e1..343790d8706 100644 --- a/tools/autoconf/Makefile +++ b/tools/autoconf/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2002/12/08 20:19:57 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 2013/08/06 21:47:01 apb Exp $ MODULE= autoconf CONFIGURE_ARGS= --program-prefix=${_TOOL_PREFIX} -CONFIGURE_ENV= M4="${TOOLDIR}/bin/${_TOOL_PREFIX}m4 -g -D__gnu__" .include "${.CURDIR}/../Makefile.gnuhost" |
