Mercurial > hg > truffle
changeset 9166:0f3fe35513a0
renamed build variable used to make a Graal/non-Graal build from OMIT_GRAAL to INCLUDE_GRAAL and ensured it is only used internally
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 16 Apr 2013 22:26:28 +0200 |
| parents | 0735e848762a |
| children | e49300a46e88 |
| files | make/bsd/makefiles/compiler1.make make/bsd/makefiles/compiler2.make make/bsd/makefiles/tiered.make make/bsd/makefiles/vm.make make/linux/makefiles/compiler1.make make/linux/makefiles/compiler2.make make/linux/makefiles/tiered.make make/linux/makefiles/vm.make make/solaris/makefiles/compiler1.make make/solaris/makefiles/compiler2.make make/solaris/makefiles/tiered.make mx/commands.py |
| diffstat | 12 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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
--- 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 :=
--- 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
--- 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
--- 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
--- 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 :=
--- 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
--- 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
--- 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
--- 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' :