summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2003-08-30 15:33:23 +0000
committerGreg Lewis <glewis@FreeBSD.org>2003-08-30 15:33:23 +0000
commit6a085cc72357bec0eb546b4eb03f374cbdb571c8 (patch)
tree093b075ec444a9841dfe9865d98eae315fb21adb /java
parentRemove two obsolete patches. (diff)
. Check for a setting of "-mcpu=k6" in CFLAGS and error if so. This
setting will cause an internal compiler error in gcc 2.95.x when compiling the JDK. PR: 46269 Submitted by: Simon Barner <barner@in.tum.de>
Notes
Notes: svn path=/head/; revision=88080
Diffstat (limited to 'java')
-rw-r--r--java/jdk13/Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index c6d781556c97..6210efa1c69a 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -196,9 +196,9 @@ post-patch:
.endif
.endif
-.if defined(WITH_LINUX_BOOTSTRAP)
-# Some checks for bootstrapping with a Linux JDK
pre-build:
+.if defined(WITH_LINUX_BOOTSTRAP)
+ # Some checks for bootstrapping with a Linux JDK
@if [ `${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/check_wrkdir_links.sh "${WRKDIRPREFIX}" "${LINUXBASE}" 2>/dev/null` ]; \
then \
${ECHO_MSG} "Please set WRKDIRPREFIX to something which doesn't"; \
@@ -216,6 +216,13 @@ pre-build:
exit 1; \
fi
.endif
+ @if [ "${CFLAGS:S/mcpu=k6//}" != "${CFLAGS:S///}" -a \
+ "`${CC} -dumpversion`" \< "3" ]; \
+ then \
+ ${ECHO_MSG} "Please remove the -mcpu=k6 option from CFLAGS as this triggers"; \
+ ${ECHO_MSG} "an internal compiler in GCC 2.95.x when compiling JDK ${JDK_VERSION}."; \
+ exit 1; \
+ fi
do-build:
# Start of jdk build