# HG changeset patch
# User ohair
# Date 1357362243 28800
# Node ID 049338f0fb4ee84b0a3858a12061d8d300e566ac
# Parent  16aa1979a5842207509b32c65fae9950c3643039
8004229: build-infra: Umbrella for switch of default "make" to new makefiles
Reviewed-by: erikj, tbell

diff -r 16aa1979a584 -r 049338f0fb4e Makefile
--- a/Makefile	Fri Jan 04 22:43:13 2013 +0100
+++ b/Makefile	Fri Jan 04 21:04:03 2013 -0800
@@ -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 -r 16aa1979a584 -r 049338f0fb4e make/jprt.properties
--- a/make/jprt.properties	Fri Jan 04 22:43:13 2013 +0100
+++ b/make/jprt.properties	Fri Jan 04 21:04:03 2013 -0800
@@ -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