summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 7385553569df..59edec136213 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -34,8 +34,9 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nlangtag \
- jvmaccess \
- jvmfwk \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess \
+ jvmfwk) \
sal \
salhelper \
tl \