Mercurial > hg > truffle
comparison make/defs.make @ 6644:09ea7e0752b3 hs24-b22
Merge
author | jcoomes |
---|---|
date | Fri, 31 Aug 2012 16:17:40 -0700 |
parents | a9fed06c01d2 |
children | 989cf02ca531 |
comparison
equal
deleted
inserted
replaced
6624:3b77f0c58018 | 6644:09ea7e0752b3 |
---|---|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 # or visit www.oracle.com if you need additional information or have any | 20 # or visit www.oracle.com if you need additional information or have any |
21 # questions. | 21 # questions. |
22 # | 22 # |
23 # | 23 # |
24 | |
25 ifeq ($(HS_ALT_MAKE),) | |
26 ifneq ($(OPENJDK),true) | |
27 HS_ALT_MAKE=$(GAMMADIR)/make/closed | |
28 else | |
29 HS_ALT_MAKE=NO_SUCH_PATH | |
30 endif | |
31 endif | |
24 | 32 |
25 # The common definitions for hotspot builds. | 33 # The common definitions for hotspot builds. |
26 | 34 |
27 # Optionally include SPEC file generated by configure. | 35 # Optionally include SPEC file generated by configure. |
28 ifneq ($(SPEC),) | 36 ifneq ($(SPEC),) |
325 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h | 333 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h |
326 | 334 |
327 ifndef JAVASE_EMBEDDED | 335 ifndef JAVASE_EMBEDDED |
328 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h | 336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h |
329 endif | 337 endif |
338 |