summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testtools/CustomTarget_bridgetest.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 4452c8e51f02..a4237d33ea7a 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -37,11 +37,16 @@ BATCH_SUFFIX :=
GIVE_EXEC_RIGHTS=chmod +x
endif
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
- $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+
+ifneq ($(SOLAR_JAVA),)
+bridgetest_TARGET := $(bridgetest_TARGET) \
$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX)
+endif
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
# which other prerequisites do we need here?
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \