Attachment #228727 for bug #258954

View | Details | Raw Unified | Return to bug 258954
Collapse All | Expand All

Lines 142-147 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk11/Makefile (+8 lines)
142	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	142	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
143	.else	143	.else
144	MAKE_ENV+= USE_CLANG=true	144	MAKE_ENV+= USE_CLANG=true
		145	.if ${COMPILER_VERSION} >= 130
		146	# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
		147	# See also https://bugs.openjdk.java.net/browse/JDK-8229258
		148	LLVM_VER= 12
		149	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
		150	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
		151	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
		152	.endif
145	.endif	153	.endif
146		154
147	.if ${ARCH} == aarch64 \|\| ${ARCH:Marmv} \|\| ${ARCH:Mpowerpc64}	155	.if ${ARCH} == aarch64 \|\| ${ARCH:Marmv} \|\| ${ARCH:Mpowerpc64}

Lines 131-136 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk12/Makefile (+8 lines)
131	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	131	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
132	.else	132	.else
133	MAKE_ENV+= USE_CLANG=true	133	MAKE_ENV+= USE_CLANG=true
		134	.if ${COMPILER_VERSION} >= 130
		135	# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
		136	# See also https://bugs.openjdk.java.net/browse/JDK-8229258
		137	LLVM_VER= 12
		138	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
		139	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
		140	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
		141	.endif
134	.endif	142	.endif
135		143
136	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}	144	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}

Lines 129-134 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk13/Makefile (+8 lines)
129	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	129	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
130	.else	130	.else
131	MAKE_ENV+= USE_CLANG=true	131	MAKE_ENV+= USE_CLANG=true
		132	.if ${COMPILER_VERSION} >= 130
		133	# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
		134	# See also https://bugs.openjdk.java.net/browse/JDK-8229258
		135	LLVM_VER= 12
		136	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
		137	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
		138	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
		139	.endif
132	.endif	140	.endif
133		141
134	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}	142	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}

Lines 131-136 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk14/Makefile (+3 lines)
131	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	131	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
132	.else	132	.else
133	MAKE_ENV+= USE_CLANG=true	133	MAKE_ENV+= USE_CLANG=true
		134	.if ${COMPILER_VERSION} >= 130
		135	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"
		136	.endif
134	.endif	137	.endif
135		138
136	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}	139	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}

Lines 130-135 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk15/Makefile (+3 lines)
130	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	130	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
131	.else	131	.else
132	MAKE_ENV+= USE_CLANG=true	132	MAKE_ENV+= USE_CLANG=true
		133	.if ${COMPILER_VERSION} >= 130
		134	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"
		135	.endif
133	.endif	136	.endif
134		137
135	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}	138	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}

Lines 132-137 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk16/Makefile (+3 lines)
132	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	132	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
133	.else	133	.else
134	MAKE_ENV+= USE_CLANG=true	134	MAKE_ENV+= USE_CLANG=true
		135	.if ${COMPILER_VERSION} >= 130
		136	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"
		137	.endif
135	.endif	138	.endif
136		139
137	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}	140	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}

Lines 133-138 CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA Link Here

(-)b/java/openjdk17/Makefile (+3 lines)
133	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"	133	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
134	.else	134	.else
135	MAKE_ENV+= USE_CLANG=true	135	MAKE_ENV+= USE_CLANG=true
		136	.if ${COMPILER_VERSION} >= 130
		137	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"
		138	.endif
136	.endif	139	.endif
137		140
138	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}	141	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}

Lines 204-209 LIB_DEPENDS+= libffi.so:devel/libffi Link Here

(-)b/java/openjdk8/Makefile (+8 lines)
204	.if ${COMPILER_TYPE} == clang	204	.if ${COMPILER_TYPE} == clang
205	MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true	205	MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
206	CONFIGURE_ENV+= LIBCXX="-lc++"	206	CONFIGURE_ENV+= LIBCXX="-lc++"
		207	.if ${COMPILER_VERSION} >= 130
		208	# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
		209	# See also https://bugs.openjdk.java.net/browse/JDK-8229258
		210	LLVM_VER= 12
		211	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
		212	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
		213	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
		214	.endif
207	.endif	215	.endif
208		216
209	# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html	217	# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html

Return to bug 258954