[src/trunk]: src/external/gpl3/gcc/usr.bin/host-libcpp duplicate a some of Ma...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/de0e512be212
branches:  trunk
changeset: 461053:de0e512be212
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Nov 14 09:27:08 2019 +0000

description:
duplicate a some of Makefile.gnuhost.

should fix PR#53561.

diffstat:

 external/gpl3/gcc/usr.bin/host-libcpp/Makefile |  32 ++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 7f413d568733 -r de0e512be212 external/gpl3/gcc/usr.bin/host-libcpp/Makefile
--- a/external/gpl3/gcc/usr.bin/host-libcpp/Makefile    Thu Nov 14 09:15:12 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/host-libcpp/Makefile    Thu Nov 14 09:27:08 2019 +0000
@@ -1,14 +1,32 @@
-#      $NetBSD: Makefile,v 1.3 2017/06/26 17:38:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.4 2019/11/14 09:27:08 mrg Exp $
+
+BUILD_ENV= \
+               AR=${HOST_AR:Q} \
+               AWK=${TOOL_AWK:Q} \
+               CC=${HOST_CC:Q} \
+               CFLAGS=${HOST_CFLAGS:Q} \
+               CONFIG_SHELL=${HOST_SH:Q} \
+               CPPFLAGS=${HOST_CPPFLAGS:Q} \
+               CXX=${HOST_CXX:Q} \
+               CXXFLAGS=${HOST_CXXFLAGS:Q} \
+               INSTALL=${HOST_INSTALL_FILE:Q} \
+               LDFLAGS=${HOST_LDFLAGS:Q} \
+               LEX=${LEX:Q} \
+               FLEX=${LEX:Q} \
+               M4=${TOOL_M4:Q} \
+               MAKE=${TOOL_GMAKE:Q} \
+               PATH="${TOOLDIR}/bin:$$PATH" \
+               RANLIB=${HOST_RANLIB:Q} \
+               YACC=${YACC:Q}
+
+GMAKE_J_ARGS?= ${MAKEFLAGS:[*]:M*-j*:C/.*(-j ?[0-9]*).*/\1/W}
+BUILD_COMMAND= /usr/bin/env -i ${BUILD_ENV} ${TOOL_GMAKE} ${GMAKE_J_ARGS} -e
 
 libcpp/libcpp.a:
        [ ! -d libcpp ] && mkdir libcpp || true
-       (cd libcpp; \
-               CC=${HOST_CC:Q} CXX=${HOST_CXX:Q}  \
-               CFLAGS=${HOST_CFLAGS:Q} \
-               MAKE=${TOOL_GMAKE:Q} \
-               CONFIG_SHELL=${HOST_SH:Q} \
+       (cd libcpp && ${BUILD_ENV} && \
                ${HOST_SH} ${DIST}/libcpp/configure -v am_cv_func_iconv=no \
-               && CC=${HOST_CC:Q} CXX=${HOST_CXX:Q} CFLAGS=${HOST_CFLAGS:Q} ${TOOL_GMAKE})
+               && ${BUILD_COMMAND})
 
 cleandir:
        -rm -rf libcpp