зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1245701 - Port build/win32 install rules to moz.build; r=glandium
MozReview-Commit-ID: 8FY0F6reO1g --HG-- extra : rebase_source : 7caa74f3627ffa99982f4502fd3a0c98077d7270
This commit is contained in:
Родитель
15969d8d22
Коммит
a88d164819
|
@ -4,27 +4,6 @@
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
REDIST_FILES =
|
||||
|
||||
ifdef WIN32_REDIST_DIR
|
||||
REDIST_FILES += '$(WIN32_REDIST_DIR)'/$(MSVC_C_RUNTIME_DLL)
|
||||
REDIST_FILES += '$(WIN32_REDIST_DIR)'/$(MSVC_CXX_RUNTIME_DLL)
|
||||
endif
|
||||
|
||||
ifdef WIN_UCRT_REDIST_DIR
|
||||
REDIST_FILES += $(wildcard $(WIN_UCRT_REDIST_DIR)/api-ms-win-*.dll)
|
||||
REDIST_FILES += '$(WIN_UCRT_REDIST_DIR)'/ucrtbase.dll
|
||||
endif
|
||||
|
||||
ifdef REDIST_FILES
|
||||
libs-preqs = \
|
||||
$(call mkdir_deps,$(FINAL_TARGET)) \
|
||||
$(NULL)
|
||||
|
||||
libs:: $(libs-preqs)
|
||||
install --preserve-timestamps $(REDIST_FILES) $(FINAL_TARGET)
|
||||
endif
|
||||
|
||||
# run the binscope tool to make sure the binary and all libraries
|
||||
# are using all available Windows OS-level security mechanisms
|
||||
# Don't do this in clang-cl since it doesn't support debug information yet.
|
||||
|
|
|
@ -14,3 +14,15 @@ if CONFIG['ENABLE_TESTS']:
|
|||
USE_STATIC_LIBS = True
|
||||
|
||||
NO_PGO = True
|
||||
|
||||
if CONFIG['WIN32_REDIST_DIR']:
|
||||
for f in ['MSVC_C_RUNTIME_DLL', 'MSVC_CXX_RUNTIME_DLL']:
|
||||
FINAL_TARGET_FILES += [
|
||||
'%%%s/%s' % (CONFIG['WIN32_REDIST_DIR'], CONFIG[f])
|
||||
]
|
||||
|
||||
if CONFIG['WIN_UCRT_REDIST_DIR']:
|
||||
for f in ['api-ms-win-*.dll', 'ucrtbase.dll']:
|
||||
FINAL_TARGET_FILES += [
|
||||
'%%%s/%s' % (CONFIG['WIN_UCRT_REDIST_DIR'], f)
|
||||
]
|
||||
|
|
|
@ -413,7 +413,7 @@ case "$target" in
|
|||
if test ! -d "$WIN_UCRT_REDIST_DIR"; then
|
||||
AC_MSG_ERROR([Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}])
|
||||
fi
|
||||
WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd`
|
||||
WIN_UCRT_REDIST_DIR=`cd "$WIN_UCRT_REDIST_DIR" && pwd -W`
|
||||
fi
|
||||
else
|
||||
AC_MSG_ERROR([This version (${_CC_MAJOR_VERSION}.${_CC_MINOR_VERSION}.${_CC_BUILD_VERSION}) of the MSVC compiler is unsupported.
|
||||
|
@ -431,7 +431,7 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
|
|||
if test ! -d "$WIN32_REDIST_DIR"; then
|
||||
AC_MSG_ERROR([Invalid Win32 Redist directory: ${WIN32_REDIST_DIR}])
|
||||
fi
|
||||
WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd`
|
||||
WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd -W`
|
||||
fi
|
||||
|
||||
dnl Ensure that mt.exe is 'Microsoft (R) Manifest Tool',
|
||||
|
@ -7249,6 +7249,7 @@ fi
|
|||
|
||||
dnl win32 options
|
||||
AC_SUBST(WIN32_REDIST_DIR)
|
||||
AC_SUBST(WIN_UCRT_REDIST_DIR)
|
||||
AC_SUBST(MAKENSISU)
|
||||
|
||||
dnl Echo the CFLAGS to remove extra whitespace.
|
||||
|
|
Загрузка…
Ссылка в новой задаче