diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2018-02-08 06:29:02 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2018-02-08 06:29:02 +0000 |
| commit | 7effcd49b2c34a53de1c0f67a87fa4aa33b59019 (patch) | |
| tree | 06be364940e9e9fe1872caf392a06d109ba848d9 | |
| parent | Fix editors/vim-tiny hanging on reading stdin during generate-plist. (diff) | |
. Fix the build for i386 when WITH_LLD_IS_LD is set.
PR: 225741
Submitted by: dim@
Notes
Notes:
svn path=/head/; revision=461197
| -rw-r--r-- | java/openjdk7/Makefile | 6 | ||||
| -rw-r--r-- | java/openjdk8/Makefile | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 59fcbeb5060e..0be6c4baed2b 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -162,6 +162,12 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk6 .include <bsd.port.pre.mk> +.if ${ARCH} == i386 +# Fix the build for i386 when WITH_LLD_IS_LD is set +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 +MAKE_ENV+= LFLAGS="-Wl,-z,notext" +.endif + # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html .if ${COMPILER_TYPE} == gcc MAKE_ENV+= USE_PRECOMPILED_HEADER=0 diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index a0a68cb5c4cb..3175031e8db2 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -331,6 +331,12 @@ CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m" MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m" .endif +.if ${ARCH} == i386 +# Fix the build for i386 when WITH_LLD_IS_LD is set +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225741 +MAKE_ENV+= LFLAGS="-Wl,-z,notext" +.endif + .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64 JDK_BUILD_JVM= server .else |