aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--make/jprt.properties3
2 files changed, 8 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 79c159e..f9162f0 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 603ce5f..990c442 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