# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1366143988 -7200
# Node ID 0f3fe35513a0ad3977e1ec90a315e8a1a582d808
# Parent  0735e848762ae51adb374856b0207851bc397f5a
renamed build variable used to make a Graal/non-Graal build from OMIT_GRAAL to INCLUDE_GRAAL and ensured it is only used internally

diff -r 0735e848762a -r 0f3fe35513a0 make/bsd/makefiles/compiler1.make
--- a/make/bsd/makefiles/compiler1.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/bsd/makefiles/compiler1.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER1
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = client-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/bsd/makefiles/compiler2.make
--- a/make/bsd/makefiles/compiler2.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/bsd/makefiles/compiler2.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER2
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = server-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/bsd/makefiles/tiered.make
--- a/make/bsd/makefiles/tiered.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/bsd/makefiles/tiered.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER2 -DCOMPILER1
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = server-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/bsd/makefiles/vm.make
--- a/make/bsd/makefiles/vm.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/bsd/makefiles/vm.make	Tue Apr 16 22:26:28 2013 +0200
@@ -196,7 +196,7 @@
 SHARK_SPECIFIC_FILES     := shark
 ZERO_SPECIFIC_FILES      := zero
 
-ifdef OMIT_GRAAL
+ifneq ($(INCLUDE_GRAAL), true)
   GRAAL_SPECIFIC_FILES   := graal\*
 else
   GRAAL_SPECIFIC_FILES   :=
diff -r 0735e848762a -r 0f3fe35513a0 make/linux/makefiles/compiler1.make
--- a/make/linux/makefiles/compiler1.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/linux/makefiles/compiler1.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER1
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = client-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/linux/makefiles/compiler2.make
--- a/make/linux/makefiles/compiler2.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/linux/makefiles/compiler2.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER2
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = server-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/linux/makefiles/tiered.make
--- a/make/linux/makefiles/tiered.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/linux/makefiles/tiered.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER2 -DCOMPILER1
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = server-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/linux/makefiles/vm.make	Tue Apr 16 22:26:28 2013 +0200
@@ -198,7 +198,7 @@
 SHARK_SPECIFIC_FILES     := shark
 ZERO_SPECIFIC_FILES      := zero
 
-ifdef OMIT_GRAAL
+ifneq ($(INCLUDE_GRAAL), true)
   GRAAL_SPECIFIC_FILES   := graal\*
 else
   GRAAL_SPECIFIC_FILES   :=
diff -r 0735e848762a -r 0f3fe35513a0 make/solaris/makefiles/compiler1.make
--- a/make/solaris/makefiles/compiler1.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/solaris/makefiles/compiler1.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER1
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = client-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/solaris/makefiles/compiler2.make
--- a/make/solaris/makefiles/compiler2.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/solaris/makefiles/compiler2.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER2
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = server-nograal
diff -r 0735e848762a -r 0f3fe35513a0 make/solaris/makefiles/tiered.make
--- a/make/solaris/makefiles/tiered.make	Fri Apr 12 16:02:41 2013 +0200
+++ b/make/solaris/makefiles/tiered.make	Tue Apr 16 22:26:28 2013 +0200
@@ -30,7 +30,7 @@
 
 CFLAGS += -DCOMPILER2 -DCOMPILER1
 
-ifndef OMIT_GRAAL
+ifeq ($(INCLUDE_GRAAL), true)
   CFLAGS += -DGRAAL
 else
   VM_SUBDIR = server-nograal
diff -r 0735e848762a -r 0f3fe35513a0 mx/commands.py
--- a/mx/commands.py	Fri Apr 12 16:02:41 2013 +0200
+++ b/mx/commands.py	Tue Apr 16 22:26:28 2013 +0200
@@ -702,9 +702,10 @@
                 runCmd.append('MAKE_VERBOSE=')
             env['JAVA_HOME'] = jdk
             if vm.endswith('nograal'):
-                env['OMIT_GRAAL'] = 'true'
+                env['INCLUDE_GRAAL'] = 'false'
                 env.setdefault('ALT_OUTPUTDIR', join(_graal_home, 'build-nograal', mx.get_os()))
             else:
+                env['INCLUDE_GRAAL'] = 'true'
                 env['GRAAL'] = join(_graal_home, 'graal') # needed for TEST_IN_BUILD
             env.setdefault('INSTALL', 'y')
             if mx.get_os() == 'solaris' :