summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RepositoryExternal.mk9
-rw-r--r--moz/ExternalPackage_moz_lib.mk2
2 files changed, 2 insertions, 9 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5285bccb0380..dd0e9d2bd65d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2234,11 +2234,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\
xpcom_core \
)
-$(call gb_LinkTarget_use_static_libraries,$(1),\
- embed_base_s \
- mozreg_s \
-)
-
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_CLIENT \
-DMOZ_REFLOW_PERF \
@@ -2274,8 +2269,8 @@ $(call gb_LinkTarget_add_defs,$(1),\
endif
$(call gb_LinkTarget_add_libs,$(1),\
- $(OUTDIR)/lib/embed_base_s.lib \
- $(OUTDIR)/lib/mozreg_s.lib \
+ $(call gb_UnpackedTarball_get_dir,moz_lib)/embed_base_s.lib \
+ $(call gb_UnpackedTarball_get_dir,moz_lib)/mozreg_s.lib \
)
endif # !GCC
diff --git a/moz/ExternalPackage_moz_lib.mk b/moz/ExternalPackage_moz_lib.mk
index 85765d330b39..6246b212cdc6 100644
--- a/moz/ExternalPackage_moz_lib.mk
+++ b/moz/ExternalPackage_moz_lib.mk
@@ -10,8 +10,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,moz_lib,moz_lib))
$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\
- embed_base_s.lib \
- mozreg_s.lib \
nslber32v50.lib \
nsldap32v50.lib \
xpcom.lib \