зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1880207 - Remove parts of Windows mozconfigs redundant with configure defaults. r=firefox-build-system-reviewers,sergesanspaille
Differential Revision: https://phabricator.services.mozilla.com/D201792
This commit is contained in:
Родитель
8e438268f7
Коммит
6f2b9826af
|
@ -1,10 +1,3 @@
|
|||
if test -d "$MOZ_FETCHES_DIR/clang/bin"; then
|
||||
CLANG_DIR=`cd "$MOZ_FETCHES_DIR/clang/bin" ; pwd`
|
||||
export PATH="${CLANG_DIR}:${PATH}"
|
||||
fi
|
||||
|
||||
export CC=clang-cl
|
||||
export CXX=clang-cl
|
||||
export ENABLE_CLANG_PLUGIN=1
|
||||
|
||||
if [ -n "$UPLOAD_PATH" ]; then
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
if test -d "$MOZ_FETCHES_DIR/clang/bin"; then
|
||||
CLANG_DIR=`cd "$MOZ_FETCHES_DIR/clang/bin" ; pwd`
|
||||
export PATH="${CLANG_DIR}:${PATH}"
|
||||
fi
|
||||
|
||||
export LINKER=lld-link
|
|
@ -1,3 +1,2 @@
|
|||
. $topsrcdir/build/win32/mozconfig.vs2019
|
||||
. "$topsrcdir/build/mozconfig.clang-cl"
|
||||
. "$topsrcdir/build/mozconfig.lld-link"
|
||||
|
|
|
@ -4,7 +4,6 @@ fi
|
|||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/x86/Microsoft.VC142.CRT"
|
||||
export WINSYSROOT="${VSPATH}"
|
||||
fi
|
||||
|
||||
ac_add_options --target=i686-pc-windows-msvc
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
. $topsrcdir/build/win64-aarch64/mozconfig.vs2019
|
||||
. "$topsrcdir/build/mozconfig.clang-cl"
|
||||
. "$topsrcdir/build/mozconfig.lld-link"
|
||||
|
|
|
@ -4,5 +4,4 @@ fi
|
|||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/arm64/Microsoft.VC142.CRT"
|
||||
export WINSYSROOT="${VSPATH}"
|
||||
fi
|
||||
|
|
|
@ -20,4 +20,3 @@ ac_add_options --disable-crashreporter
|
|||
ac_add_options --disable-profiling
|
||||
|
||||
. "$topsrcdir/build/mozconfig.clang-cl"
|
||||
. "$topsrcdir/build/mozconfig.lld-link"
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
. $topsrcdir/build/win64/mozconfig.vs2019
|
||||
. "$topsrcdir/build/mozconfig.clang-cl"
|
||||
. "$topsrcdir/build/mozconfig.lld-link"
|
||||
|
|
|
@ -4,5 +4,4 @@ fi
|
|||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
export WIN32_REDIST_DIR=${VSPATH}/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT
|
||||
export WINSYSROOT="${VSPATH}"
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче