Mercurial > hg > truffle
comparison make/defs.make @ 5946:3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
Reviewed-by: dholmes, ohair
author | erikj |
---|---|
date | Mon, 19 Mar 2012 10:09:24 +0100 |
parents | 7292cff45988 |
children | a9fed06c01d2 |
comparison
equal
deleted
inserted
replaced
5945:77591ef8983a | 5946:3d7ea1dbe0de |
---|---|
52 endef | 52 endef |
53 define prep-target | 53 define prep-target |
54 @$(MKDIR) -p $(@D) | 54 @$(MKDIR) -p $(@D) |
55 @$(RM) $@ | 55 @$(RM) $@ |
56 endef | 56 endef |
57 | |
58 # Default values for JVM_VARIANT* variables if configure hasn't set | |
59 # it already. | |
60 ifeq ($(JVM_VARIANTS),) | |
61 ifeq ($(ZERO_BUILD), true) | |
62 ifeq ($(SHARK_BUILD), true) | |
63 JVM_VARIANTS:=zeroshark | |
64 JVM_VARIANT_ZEROSHARK:=true | |
65 else | |
66 JVM_VARIANTS:=zero | |
67 JVM_VARIANT_ZERO:=true | |
68 endif | |
69 else | |
70 # A default is needed | |
71 ifeq ($(BUILD_CLIENT_ONLY), true) | |
72 JVM_VARIANTS:=client | |
73 JVM_VARIANT_CLIENT:=true | |
74 endif | |
75 # Further defaults are platform and arch specific | |
76 endif | |
77 endif | |
57 | 78 |
58 # Directory paths and user name | 79 # Directory paths and user name |
59 # Unless GAMMADIR is set on the command line, search upward from | 80 # Unless GAMMADIR is set on the command line, search upward from |
60 # the current directory for a parent directory containing "src/share/vm". | 81 # the current directory for a parent directory containing "src/share/vm". |
61 # If that fails, look for $GAMMADIR in the environment. | 82 # If that fails, look for $GAMMADIR in the environment. |