Bug 1286286 - Followup fix for allowing missing ucrt in VS2013 builds. r=ewong a=ewong
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Wed, 27 Jul 2016 13:05:30 +0200
changeset 24952 7ffc144308b683ff84c64a667f17bdcf1ee5ed48
parent 24951 5fa5c9d3a40ab8e97002e70f72e4b98fee1fdd72
child 24953 fed8676c0fc29f569b79ff30cca491e6ab9a3797
push id1685
push userfrgrahl@gmx.net
push dateWed, 27 Jul 2016 11:06:18 +0000
treeherdercomm-beta@7ffc144308b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, ewong
bugs1286286
Bug 1286286 - Followup fix for allowing missing ucrt in VS2013 builds. r=ewong a=ewong
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -98,28 +98,26 @@ endif
 ifdef MOZ_MOVEMAIL
 DEFINES += -DMOZ_MOVEMAIL=1
 endif
 ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI=1
 endif
 
 # Set MSVC dlls version to package, if any.
-# With VS2015+ it does not make sense to define the ucrt libs without
-# the base c++ libs and vice versa. 
 ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
-ifdef WIN_UCRT_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
 DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
+endif
+ifdef WIN_UCRT_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_WIN_UCRT_DLLS=1
 endif
 endif
-endif
 
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif
 
 ifneq (en-US, $(AB_CD))
 DEFINES += -DLOCALE_BUILD=1
 endif
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -104,16 +104,18 @@
 #endif
 #endif # MOZ_ANGLE_RENDERER
 
 #ifdef XP_WIN
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #if MOZ_PACKAGE_MSVC_DLLS
 @BINPATH@/@MSVC_C_RUNTIME_DLL@
 @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
+#endif
+#if MOZ_PACKAGE_WIN_UCRT_DLLS
 @BINPATH@/api-ms-win-*.dll
 @BINPATH@/ucrtbase.dll
 #endif
 #endif
 
 #ifdef MOZ_ICU_DATA_ARCHIVE
 @RESPATH@/@ICU_DATA_FILE@
 #endif