Mercurial > hg > truffle
comparison make/defs.make @ 6785:b86575d092a2
Merge
author | dsamersoff |
---|---|
date | Thu, 27 Sep 2012 20:22:57 +0400 |
parents | 989cf02ca531 |
children | fb19af007ffc |
comparison
equal
deleted
inserted
replaced
6764:ef7fe63a2d39 | 6785:b86575d092a2 |
---|---|
330 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h | 330 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h |
331 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h | 331 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h |
332 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h | 332 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h |
333 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h | 333 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h |
334 | 334 |
335 # By default, run Queens test after building | |
336 TEST_IN_BUILD ?= true | |
337 | |
335 ifndef JAVASE_EMBEDDED | 338 ifndef JAVASE_EMBEDDED |
336 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h | 339 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h |
337 endif | 340 endif |
338 | 341 |