Module Name: src
Committed By: mrg
Date: Thu Nov 14 09:27:09 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile
Log Message:
duplicate a some of Makefile.gnuhost.
should fix PR#53561.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.3 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.3 Mon Jun 26 17:38:10 2017
+++ src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile Thu Nov 14 09:27:08 2019
@@ -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 $
-libcpp/libcpp.a:
- [ ! -d libcpp ] && mkdir libcpp || true
- (cd libcpp; \
- CC=${HOST_CC:Q} CXX=${HOST_CXX:Q} \
+BUILD_ENV= \
+ AR=${HOST_AR:Q} \
+ AWK=${TOOL_AWK:Q} \
+ CC=${HOST_CC:Q} \
CFLAGS=${HOST_CFLAGS:Q} \
- MAKE=${TOOL_GMAKE: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 && ${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
