diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-08-25 20:55:19 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-08-25 20:55:19 +0000 |
| commit | b15300700809b5697bbce01970eeaebae65c894e (patch) | |
| tree | 96b4f986ad317a0acf950d1215b9089edbc9b72f /java | |
| parent | c1c56f1796a36c9482cdead8e9c9fa56f4f26fc8 (diff) | |
| download | ports-b15300700809b5697bbce01970eeaebae65c894e.tar.gz ports-b15300700809b5697bbce01970eeaebae65c894e.zip | |
Allow the JDK to be compiled with gcc.
This is required for powerpc64 support.
PR: 237370
Notes
Notes:
svn path=/head/; revision=509856
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk12/Makefile | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index cd860ddc1cc8..cd227e32e220 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -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} \ + MAKEFLAGS="" -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/} +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} @@ -60,8 +60,9 @@ JDK_BUILD_NUMBER= 10 BSD_JDK_VERSION= 2 GNU_CONFIGURE= yes -CONFIGURE_ENV= CC=/usr/bin/cc \ - CXX=/usr/bin/c++ +CONFIGURE_ENV= CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-ccache \ --disable-javac-server \ @@ -79,7 +80,6 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ - --with-toolchain-type=clang \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib \ --with-cacerts-file=${FILESDIR}/cacerts \ @@ -113,6 +113,20 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 JDK_BUILD_JVM= server +MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} + +.if ${COMPILER_TYPE} == gcc +USE_GCC= yes +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}" +.else +MAKE_ENV+= USE_CLANG=true +.endif + .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else |