svn commit: r461197 - in head/java: openjdk7 openjdk8

[Greg Lewis]

Author: glewis
Date: Thu Feb  8 06:29:02 2018
New Revision: 461197
URL: https://svnweb.freebsd.org/changeset/ports/461197

Log:
  . Fix the build for i386 when WITH_LLD_IS_LD is set.
  
  PR:		225741
  Submitted by:	dim@

Modified:
  head/java/openjdk7/Makefile
  head/java/openjdk8/Makefile

Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile	Thu Feb  8 05:52:06 2018	(r461196)
+++ head/java/openjdk7/Makefile	Thu Feb  8 06:29:02 2018	(r461197)
@@ -162,6 +162,12 @@ BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/boo
 
 .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

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Thu Feb  8 05:52:06 2018	(r461196)
+++ head/java/openjdk8/Makefile	Thu Feb  8 06:29:02 2018	(r461197)
@@ -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