diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-01-14 01:31:01 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-01-14 01:31:01 +0000 |
| commit | d5e0a182cf153f8993a633b93d9220c99a89e760 (patch) | |
| tree | e94bebb81fe6cb8a9cd5f057b87a7381bc46d480 /contrib/bmake/mk/init.mk | |
| parent | 6b1c534927ad47e9b0dd8be1a39f56c3ea813d44 (diff) | |
| parent | 7a05a7153af649605e1ebde33aac94a14ed2a4cd (diff) | |
| download | src-d5e0a182cf153f8993a633b93d9220c99a89e760.tar.gz src-d5e0a182cf153f8993a633b93d9220c99a89e760.zip | |
Update to bmake-20240108
Diffstat (limited to 'contrib/bmake/mk/init.mk')
| -rw-r--r-- | contrib/bmake/mk/init.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/bmake/mk/init.mk b/contrib/bmake/mk/init.mk index b740378cd69a..b0d365754d86 100644 --- a/contrib/bmake/mk/init.mk +++ b/contrib/bmake/mk/init.mk @@ -1,4 +1,4 @@ -# $Id: init.mk,v 1.27 2022/01/01 17:32:18 sjg Exp $ +# $Id: init.mk,v 1.30 2023/10/03 16:25:01 sjg Exp $ # # @(#) Copyright (c) 2002, Simon J. Gerraty # @@ -32,6 +32,11 @@ _this_mk_dir := ${.PARSEDIR} # should have been set by sys.mk CXX_SUFFIXES?= .cc .cpp .cxx .C +.if defined(PROG_CXX) || ${SRCS:Uno:${CXX_SUFFIXES:S,^,N*,:ts:}} != ${SRCS:Uno:N/} +_CCLINK ?= ${CXX} +.endif +_CCLINK ?= ${CC} + .if !empty(WARNINGS_SET) || !empty(WARNINGS_SET_${MACHINE_ARCH}) .include <warnings.mk> .endif @@ -51,6 +56,7 @@ QUALIFIED_VAR_LIST += \ CPPFLAGS \ CPUFLAGS \ LDFLAGS \ + SRCS \ # a final :U avoids errors if someone uses := .for V in ${QUALIFIED_VAR_LIST:O:u:@q@$q $q_LAST@} |