changeset 568:5cf7750c8c43

8004229: build-infra: Umbrella for switch of default "make" to new makefiles Reviewed-by: erikj, tbell
author ohair
date Fri, 04 Jan 2013 21:04:03 -0800
parents 2597feac57c0
children 7a3c6ffdf1fb
files Makefile make/jprt.properties
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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