diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-21 00:06:27 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-28 09:35:12 +0000 |
| commit | 7f4a622f9fbf27774efa908348e682df7280713b (patch) | |
| tree | c735f1768d0b7868ad7fcc43c8b5be517648b771 | |
| parent | 62d5b496b87b3beb6273da9643a1883fcd8afece (diff) | |
stop copying MSVC debug runtime DLLs
This is apparently not necessary with MSVC 2012; builds and all tests
run here without those DLLs in the solver.
Change-Id: If352fb3702d7dae57deb19959eab8eb0fedea318
Reviewed-on: https://gerrit.libreoffice.org/4414
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/Package_msvc_dlls_debug.mk | 16 |
4 files changed, 0 insertions, 36 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index c0f4e6bd7f77..f3470f35227d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -347,8 +347,6 @@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@ export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@ export MSVC_DLLS=@MSVC_DLLS@ export MSVC_DLL_PATH=@MSVC_DLL_PATH@ -export MSVC_DEBUG_DLLS=@MSVC_DEBUG_DLLS@ -export MSVC_DEBUG_DLL_PATH=@MSVC_DEBUG_DLL_PATH@ export MSVC_USE_DEBUG_RUNTIME=@MSVC_USE_DEBUG_RUNTIME@ export MSVC80_DLLS=@MSVC80_DLLS@ export MSVC80_DLL_PATH=@MSVC80_DLL_PATH@ diff --git a/configure.ac b/configure.ac index 42d1569b2069..e193a8a787ab 100644 --- a/configure.ac +++ b/configure.ac @@ -4909,28 +4909,13 @@ AC_MSG_NOTICE([checking msms =================================================== find_msvc_x64_dlls() { - if test "$CPUNAME" = "INTEL"; then - vsarch=x86 - else - vsarch=x64 - fi - msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" - MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT" msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll" - MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll" for dll in $msvcdlls; do if ! test -f "$msvcdllpath/$dll"; then AC_MSG_ERROR([can not find $dll in $msvcdllpath]) fi done - if test -n "$MSVC_USE_DEBUG_RUNTIME"; then - for dll in $MSVC_DEBUG_DLLS; do - if ! test -f "$MSVC_DEBUG_DLL_PATH/$dll"; then - AC_MSG_ERROR([can not find $dll in $MSVC_DEBUG_DLL_PATH]) - fi - done - fi } if test "$build_os" = "cygwin"; then @@ -6243,8 +6228,6 @@ fi AC_SUBST(MSVC_DLL_PATH) AC_SUBST(MSVC_DLLS) -AC_SUBST(MSVC_DEBUG_DLL_PATH) -AC_SUBST(MSVC_DEBUG_DLLS) AC_SUBST(MSM_PATH) AC_SUBST(MERGE_MODULES) diff --git a/external/Module_external.mk b/external/Module_external.mk index 8cda13e6658a..907b23b6ca28 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,external,\ Package_dbghelp \ $(if $(MSM_PATH),Package_msms) \ Package_msvc_dlls \ - $(if $(MSVC_USE_DEBUG_RUNTIME),Package_msvc_dlls_debug) \ $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ )) endif diff --git a/external/Package_msvc_dlls_debug.mk b/external/Package_msvc_dlls_debug.mk deleted file mode 100644 index 3e847645fbb4..000000000000 --- a/external/Package_msvc_dlls_debug.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DEBUG_DLL_PATH))) - -$(eval $(call gb_Package_add_files,msvc_dlls,bin,\ - $(MSVC_DEBUG_DLLS) \ -)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: |