summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Repository.mk5
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk
index 57c855460f15..aaca80a53f56 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -496,8 +496,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
xmlreader \
))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+# FIXME fdo#69601
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
+))
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(if $(filter MSC,$(COM)),cli_uno) \
getuid \
jpipe \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 2269d33ddd9e..026e77559ec9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -544,7 +544,7 @@ gb_InstallScript_EXT := .inf
# CliAssemblyTarget class
gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
-gb_CliAssemblyTarget_get_dll = $(call gb_Library__get_dir_for_layer,URELIB)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
+gb_CliAssemblyTarget_get_dll = $(call gb_Library__get_dir_for_layer,NONE)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
# Extension class