Thu Sep 1 01:36:43 2022 UTC ()
llvm: fix botch in previous commit


(gutteridge)
diff -r1.80 -r1.81 pkgsrc/lang/llvm/Makefile
cvs diff -r1.80 -r1.81 pkgsrc/lang/llvm/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/llvm/Makefile 2022/09/01 01:32:29 1.80
+++ pkgsrc/lang/llvm/Makefile 2022/09/01 01:36:42 1.81
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.80 2022/09/01 01:32:29 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.81 2022/09/01 01:36:42 gutteridge Exp $
2# 2#
3# When updating this, please also update: 3# When updating this, please also update:
4# devel/include-what-you-use 4# devel/include-what-you-use
5# devel/lld 5# devel/lld
6# devel/lldb 6# devel/lldb
7# devel/polly 7# devel/polly
8# lang/clang 8# lang/clang
9# lang/clang-tools-extra 9# lang/clang-tools-extra
10# lang/compiler-rt 10# lang/compiler-rt
11# lang/libcxx 11# lang/libcxx
12# lang/libcxxabi 12# lang/libcxxabi
13# lang/libunwind 13# lang/libunwind
14# lang/wasi-compiler-rt 14# lang/wasi-compiler-rt
@@ -113,27 +113,26 @@ PRINT_PLIST_AWK+= { gsub(/\.${SOEXT}/, " @@ -113,27 +113,26 @@ PRINT_PLIST_AWK+= { gsub(/\.${SOEXT}/, "
113.if ${MACHINE_ARCH} == "i386" 113.if ${MACHINE_ARCH} == "i386"
114CXXFLAGS+= -march=i586 114CXXFLAGS+= -march=i586
115.endif 115.endif
116 116
117.if ${MACHINE_ARCH:Mpowerpc*} 117.if ${MACHINE_ARCH:Mpowerpc*}
118# Needed to avoid "relocation truncated to fit: R_PPC_REL24" 118# Needed to avoid "relocation truncated to fit: R_PPC_REL24"
119CFLAGS+= -mlongcall 119CFLAGS+= -mlongcall
120CXXFLAGS+= -mlongcall 120CXXFLAGS+= -mlongcall
121. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 099917 121. if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 099917
122# The -mno-pltseq option is not available in gcc7, but is needed for 122# The -mno-pltseq option is not available in gcc7, but is needed for
123# the above-mentioned relocation truncation issue in newer GCC 123# the above-mentioned relocation truncation issue in newer GCC
124CFLAGS+= -mno-pltseq 124CFLAGS+= -mno-pltseq
125CXXFLAGS+= -mno-pltseq 125CXXFLAGS+= -mno-pltseq
126. endif 
127. else # Not NetBSD 126. else # Not NetBSD
128# Let's just insist on newer gcc -- untested. 127# Let's just insist on newer gcc -- untested.
129CFLAGS+= -mno-pltseq 128CFLAGS+= -mno-pltseq
130CXXFLAGS+= -mno-pltseq 129CXXFLAGS+= -mno-pltseq
131. endif 130. endif
132.endif 131.endif
133 132
134.if ${OPSYS} == "NetBSD" 133.if ${OPSYS} == "NetBSD"
135CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread 134CMAKE_ARGS+= -DPKGSRC_LLVM_PTHREADLIB=-lpthread
136.endif 135.endif
137 136
138.include "options.mk" 137.include "options.mk"
139 138