svn commit: r509856 - head/java/openjdk12

[Gerald Pfeifer]

On Sun, 25 Aug 2019, Greg Lewis wrote:
> Log:
>   Allow the JDK to be compiled with gcc.

> Modified: head/java/openjdk12/Makefile
> ==============================================================================
> --- head/java/openjdk12/Makefile	Sun Aug 25 20:28:47 2019	(r509855)
> +++ head/java/openjdk12/Makefile	Sun Aug 25 20:55:19 2019	(r509856)
> @@ -41,12 +41,12 @@ MAKE_ENV=	LANG="C" \
>  		CLASSPATH="" \
>  		JAVA_HOME="" \
>  		LD_LIBRARY_PATH="" \
> -		CC=/usr/bin/cc \
> -		CXX=/usr/bin/c++ \
> -		MAKEFLAGS="" \
> -		USE_CLANG=true
> +		CC=${CC} \
> +		CXX=${CXX} \
> +		CPP=${CPP} \

These three lines should not be necessary since Mk/bsd.ports.mk
features

    MAKE_ENV+=          PREFIX=${PREFIX} \
                        LOCALBASE=${LOCALBASE} \
                        CC="${CC}" CFLAGS="${CFLAGS}" \
                        CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
                        LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
                        CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \

Was there anything in your tests that made you add those?

> -CONFIGURE_ENV=	CC=/usr/bin/cc \
> -		CXX=/usr/bin/c++
> +CONFIGURE_ENV=	CC=${CC} \
> +		CXX=${CXX} \
> +		CPP=${CPP}

Similarly here since configure is invoked with

     ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" ...

in Mk/bsd.ports.mk.

> +CONFIGURE_ARGS+=	--disable-warnings-as-errors \
> +			--disable-dtrace \
> +			--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
> +			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
> +			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"

That should be in in CFLAGS, CXXFLAGS, and LDFLAGS as it is set by
USE_GCC=yes.  Is this not working properly?

Gerald