From ec348edbe6823cd872a3acda55d3f8b8e2a07a82 Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Fri, 4 Jan 2013 21:04:03 -0800
Subject: [PATCH] 8004229: build-infra: Umbrella for switch of default "make"
 to new makefiles

Reviewed-by: erikj, tbell
---
 Makefile             | 5 +++++
 make/jprt.properties | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 79c159e9e5c..f9162f0b641 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,11 @@
 # If NEWBUILD is defined, use the new build-infra Makefiles and configure.
 #     See NewMakefile.gmk for more information.
 
+# If not specified, select what the default build is
+ifndef NEWBUILD
+  NEWBUILD=true
+endif
+
 ifeq ($(NEWBUILD),true)
 
   # The new top level Makefile
diff --git a/make/jprt.properties b/make/jprt.properties
index 603ce5fda94..990c442a164 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -28,6 +28,9 @@
 # Locked down to jdk8
 jprt.tools.default.release=jdk8
 
+# Unix toolkit to use for building on windows
+jprt.windows.jdk8.build.unix.toolkit=cygwin
+
 # The different build flavors we want, we override here so we just get these 2
 jprt.build.flavors=product,fastdebug