--- a/make/test/JtregNativeJdk.gmk Tue Mar 12 14:35:26 2019 +0000
+++ b/make/test/JtregNativeJdk.gmk Tue Mar 12 08:04:33 2019 -0700
@@ -82,19 +82,23 @@
BUILD_JDK_JTREG_EXCLUDE += exeJniInvocationTest.c
endif
-$(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
- TYPE := LIBRARY, \
- SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
- OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
- EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
-))
+# This evaluation is expensive and should only be done if this target was
+# explicitly called.
+ifneq ($(filter build-test-jdk-jtreg-native, $(MAKECMDGOALS)), )
+ $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
+ TYPE := LIBRARY, \
+ SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
+ OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
+ EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
+ ))
-$(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_EXECUTABLES, \
- TYPE := PROGRAM, \
- SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
- OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
- EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
-))
+ $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_EXECUTABLES, \
+ TYPE := PROGRAM, \
+ SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \
+ OUTPUT_DIR := $(BUILD_JDK_JTREG_OUTPUT_DIR), \
+ EXCLUDE := $(BUILD_JDK_JTREG_EXCLUDE), \
+ ))
+endif
build-test-jdk-jtreg-native: $(BUILD_JDK_JTREG_LIBRARIES) $(BUILD_JDK_JTREG_EXECUTABLES)