Fri Apr 17 13:36:26 2020 UTC ()
Adjust last to really prepend in the case of cwrappers.


(joerg)
diff -r1.24 -r1.25 pkgsrc/mk/compiler/clang.mk
cvs diff -r1.24 -r1.25 pkgsrc/mk/compiler/clang.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/clang.mk 2020/04/17 13:35:36 1.24
+++ pkgsrc/mk/compiler/clang.mk 2020/04/17 13:36:26 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: clang.mk,v 1.24 2020/04/17 13:35:36 joerg Exp $ 1# $NetBSD: clang.mk,v 1.25 2020/04/17 13:36:26 joerg Exp $
2# 2#
3# This is the compiler definition for the clang compiler. 3# This is the compiler definition for the clang compiler.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# CLANGBASE 7# CLANGBASE
8# The base directory where the compiler is installed. 8# The base directory where the compiler is installed.
9# 9#
10 10
11.if !defined(COMPILER_CLANG_MK) 11.if !defined(COMPILER_CLANG_MK)
12COMPILER_CLANG_MK= defined 12COMPILER_CLANG_MK= defined
13 13
14# Add the dependency on clang 14# Add the dependency on clang
@@ -81,22 +81,23 @@ LDFLAGS+= ${_CLANG_LDFLAGS} @@ -81,22 +81,23 @@ LDFLAGS+= ${_CLANG_LDFLAGS}
81# 81#
82_LANGUAGES.clang= # empty 82_LANGUAGES.clang= # empty
83.for _lang_ in ${USE_LANGUAGES} 83.for _lang_ in ${USE_LANGUAGES}
84_LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}} 84_LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}}
85.endfor 85.endfor
86 86
87PKGSRC_FORTRAN?=gfortran 87PKGSRC_FORTRAN?=gfortran
88 88
89.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77)) 89.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77))
90. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk" 90. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
91.endif 91.endif
92 92
93_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments -fcommon 93_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments -fcommon
94CWRAPPERS_APPEND.cc+= -Qunused-arguments -fcommon 94CWRAPPERS_APPEND.cc+= -Qunused-arguments
 95CWRAPPERS_PREPEND.cc+= -Qunused-arguments -fcommon
95_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments 96_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments
96CWRAPPERS_APPEND.cxx+= -Qunused-arguments 97CWRAPPERS_APPEND.cxx+= -Qunused-arguments
97 98
98.for _version_ in ${_CXX_STD_VERSIONS} 99.for _version_ in ${_CXX_STD_VERSIONS}
99_CXX_STD_FLAG.${_version_}?= -std=${_version_} 100_CXX_STD_FLAG.${_version_}?= -std=${_version_}
100.endfor 101.endfor
101 102
102.endif # COMPILER_CLANG_MK 103.endif # COMPILER_CLANG_MK