Mercurial > hg > truffle
comparison make/windows/makefiles/defs.make @ 6854:fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
| author | jprovino |
|---|---|
| date | Wed, 10 Oct 2012 14:35:58 -0400 |
| parents | 0d8e265ba727 |
| children | 857f3ce858dd |
comparison
equal
deleted
inserted
replaced
| 6830:81e878c53615 | 6854:fb19af007ffc |
|---|---|
| 152 MAKE_ARGS += ZIPEXE=$(ZIPEXE) | 152 MAKE_ARGS += ZIPEXE=$(ZIPEXE) |
| 153 | 153 |
| 154 # On 32 bit windows we build server, client and kernel, on 64 bit just server. | 154 # On 32 bit windows we build server, client and kernel, on 64 bit just server. |
| 155 ifeq ($(JVM_VARIANTS),) | 155 ifeq ($(JVM_VARIANTS),) |
| 156 ifeq ($(ARCH_DATA_MODEL), 32) | 156 ifeq ($(ARCH_DATA_MODEL), 32) |
| 157 JVM_VARIANTS:=client,server,kernel | 157 JVM_VARIANTS:=client,server |
| 158 JVM_VARIANT_CLIENT:=true | 158 JVM_VARIANT_CLIENT:=true |
| 159 JVM_VARIANT_SERVER:=true | 159 JVM_VARIANT_SERVER:=true |
| 160 JVM_VARIANT_KERNEL:=true | |
| 161 else | 160 else |
| 162 JVM_VARIANTS:=server | 161 JVM_VARIANTS:=server |
| 163 JVM_VARIANT_SERVER:=true | 162 JVM_VARIANT_SERVER:=true |
| 164 endif | 163 endif |
| 165 endif | 164 endif |