Bug 1357797 - Do not attempt to package based on empty variables in artifact builds. r=mshal
Artifact builds can't rely on variables such as MSVC_C_RUNTIME_DLL when
packaging because they haven't run the parts of configure that sets
them. Existing references to these variables in package-manifest.in
are causing us to package entire directories we shouldn't when these
variables are empty. This commit prevents us from relying on these
variables when packaging an artifact build.
MozReview-Commit-ID: 48jOsdvpoxJ
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -63,24 +63,26 @@ DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$
endif
endif
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
# Set MSVC dlls version to package, if any.
ifdef MOZ_NO_DEBUG_RTL
ifdef WIN32_REDIST_DIR
+ifndef MOZ_ARTIFACT_BUILDS
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
ifdef NECKO_WIFI
DEFINES += -DNECKO_WIFI
endif
