1.1 --- a/make/linux/makefiles/minimal1.make Wed Jul 24 19:23:26 2013 -0400
1.2 +++ b/make/linux/makefiles/minimal1.make Thu Jul 25 21:05:29 2013 -0400
1.3 @@ -24,16 +24,20 @@
1.4
1.5 TYPE=MINIMAL1
1.6
1.7 -INCLUDE_JVMTI ?= false
1.8 -INCLUDE_FPROF ?= false
1.9 -INCLUDE_VM_STRUCTS ?= false
1.10 -INCLUDE_JNI_CHECK ?= false
1.11 -INCLUDE_SERVICES ?= false
1.12 -INCLUDE_MANAGEMENT ?= false
1.13 -INCLUDE_ALL_GCS ?= false
1.14 -INCLUDE_NMT ?= false
1.15 -INCLUDE_TRACE ?= false
1.16 -INCLUDE_CDS ?= false
1.17 +# Force all variables to false, overriding any other
1.18 +# setting that may have occurred in the makefiles. These
1.19 +# can still be overridden by passing the variable as an
1.20 +# argument to 'make'
1.21 +INCLUDE_JVMTI := false
1.22 +INCLUDE_FPROF := false
1.23 +INCLUDE_VM_STRUCTS := false
1.24 +INCLUDE_JNI_CHECK := false
1.25 +INCLUDE_SERVICES := false
1.26 +INCLUDE_MANAGEMENT := false
1.27 +INCLUDE_ALL_GCS := false
1.28 +INCLUDE_NMT := false
1.29 +INCLUDE_TRACE := false
1.30 +INCLUDE_CDS := false
1.31
1.32 CXXFLAGS += -DMINIMAL_JVM -DCOMPILER1 -DVMTYPE=\"Minimal\"
1.33 CFLAGS += -DMINIMAL_JVM -DCOMPILER1 -DVMTYPE=\"Minimal\"
