From f945d0ba4dcce6ecdf5e612e521253b2eb1013b1 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Tue, 6 Dec 2016 11:38:05 +0100
Subject: [PATCH] 8170784: JDK-8038957 broke cross compilation

Reviewed-by: dholmes, ihse
---
 common/autoconf/buildjdk-spec.gmk.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/autoconf/buildjdk-spec.gmk.in b/common/autoconf/buildjdk-spec.gmk.in
index 8eafa0a119a..ddd388c0f1c 100644
--- a/common/autoconf/buildjdk-spec.gmk.in
+++ b/common/autoconf/buildjdk-spec.gmk.in
@@ -89,4 +89,10 @@ ENABLE_DEBUG_SYMBOLS := false
 # Control wether Hotspot builds gtest tests
 BUILD_GTEST := false
 
-JVM_VARIANTS := server
\ No newline at end of file
+JVM_VARIANTS := server
+
+# Some users still set EXTRA_*FLAGS on the make command line. Must
+# make sure to override that when building buildjdk.
+override EXTRA_CFLAGS :=
+override EXTRA_CXXFLAGS :=
+override EXTRA_LDFLAGS :=