Attachment #232749 for bug #262845

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

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

(-)b/java/openjdk13/Makefile (-1 / +6 lines)
130	.else	130	.else
131	MAKE_ENV+= USE_CLANG=true	131	MAKE_ENV+= USE_CLANG=true
132	.if ${COMPILER_VERSION} >= 130	132	.if ${COMPILER_VERSION} >= 130
133	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"	133	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
		134	.if ${COMPILER_VERSION} >= 140
		135	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
		136	.endif
		137	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
		138	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
134	.endif	139	.endif
135	.endif	140	.endif
136		141

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

(-)b/java/openjdk14/Makefile (-1 / +6 lines)
132	.else	132	.else
133	MAKE_ENV+= USE_CLANG=true	133	MAKE_ENV+= USE_CLANG=true
134	.if ${COMPILER_VERSION} >= 130	134	.if ${COMPILER_VERSION} >= 130
135	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"	135	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
		136	.if ${COMPILER_VERSION} >= 140
		137	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
		138	.endif
		139	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
		140	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
136	.endif	141	.endif
137	.endif	142	.endif
138		143

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

(-)b/java/openjdk15/Makefile (-1 / +6 lines)
131	.else	131	.else
132	MAKE_ENV+= USE_CLANG=true	132	MAKE_ENV+= USE_CLANG=true
133	.if ${COMPILER_VERSION} >= 130	133	.if ${COMPILER_VERSION} >= 130
134	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"	134	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
		135	.if ${COMPILER_VERSION} >= 140
		136	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
		137	.endif
		138	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
		139	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
135	.endif	140	.endif
136	.endif	141	.endif
137		142

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

(-)b/java/openjdk16/Makefile (-1 / +6 lines)
134	.else	134	.else
135	MAKE_ENV+= USE_CLANG=true	135	MAKE_ENV+= USE_CLANG=true
136	.if ${COMPILER_VERSION} >= 130	136	.if ${COMPILER_VERSION} >= 130
137	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"	137	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
		138	.if ${COMPILER_VERSION} >= 140
		139	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
		140	.endif
		141	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
		142	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
138	.endif	143	.endif
139	.endif	144	.endif
140		145

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

(-)b/java/openjdk17/Makefile (-1 / +6 lines)
149	.else	149	.else
150	MAKE_ENV+= USE_CLANG=true	150	MAKE_ENV+= USE_CLANG=true
151	.if ${COMPILER_VERSION} >= 130	151	.if ${COMPILER_VERSION} >= 130
152	CONFIGURE_ARGS+= --with-extra-cflags="-Wno-unused-but-set-parameter"	152	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
		153	.if ${COMPILER_VERSION} >= 140
		154	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
		155	.endif
		156	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
		157	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
153	.endif	158	.endif
154	.endif	159	.endif
155		160

Return to bug 262845