mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
Backed out changeset df47d3ad9cc6 (bug 1475998) for Windows MinGW bustages.
This commit is contained in:
Narcis Beleuzu
parent
b319c000c3
commit
39e04b8a5f
@ -1,79 +0,0 @@
|
||||
# Sets:
|
||||
# MOZ_AUTOMATION flags
|
||||
# SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE - shouldn't be used?
|
||||
# TOOLTOOL_DIR
|
||||
# MAKECAB - shouldn't be used?
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
|
||||
# MinGW does not have (or need) makecab
|
||||
unset MAKECAB
|
||||
|
||||
# Sets:
|
||||
# build/mozconfig.common
|
||||
# AUTOCLOBBER=1
|
||||
# --enable-crashreporter
|
||||
# --enable-release
|
||||
# LLVM_CONFIG
|
||||
# MOZ_ADDON_SIGNING
|
||||
# MOZ_REQUIRE_SIGNING
|
||||
# --enable-js-shell
|
||||
# build/mozconfig.automation
|
||||
# MOZ_AUTOMATION_ flags
|
||||
# build/mozconfig.rust
|
||||
# TOOLTOOL_DIR
|
||||
# RUSTC
|
||||
# CARGO
|
||||
. "$topsrcdir/browser/config/mozconfigs/common"
|
||||
|
||||
# MinGW Stuff
|
||||
ac_add_options --target=i686-w64-mingw32
|
||||
ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
|
||||
|
||||
ac_add_options --disable-warnings-as-errors
|
||||
|
||||
# Temporary config settings until we get these working on mingw
|
||||
ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/
|
||||
|
||||
# For now, we'll disable the sandbox, until we get get Bug 1461421 figured out
|
||||
ac_add_options --disable-sandbox
|
||||
|
||||
# These aren't supported on mingw at this time
|
||||
ac_add_options --disable-maintenance-service
|
||||
ac_add_options --disable-webrtc # Bug 1393901
|
||||
ac_add_options --disable-geckodriver # Bug 1489320
|
||||
|
||||
# Find our toolchain
|
||||
HOST_CC="$TOOLTOOL_DIR/clang/bin/clang"
|
||||
HOST_CXX="$TOOLTOOL_DIR/clang/bin/clang++"
|
||||
CC="$TOOLTOOL_DIR/clang/bin/i686-w64-mingw32-clang"
|
||||
CXX="$TOOLTOOL_DIR/clang/bin/i686-w64-mingw32-clang++"
|
||||
CXXFLAGS="-fms-extensions"
|
||||
CPP="$TOOLTOOL_DIR/clang/bin/i686-w64-mingw32-clang -E"
|
||||
AR=llvm-ar
|
||||
RANLIB=llvm-ranlib
|
||||
|
||||
# For Stylo
|
||||
BINDGEN_CFLAGS="-I$TOOLTOOL_DIR/clang/i686-w64-mingw32/include/c++/v1 -I$TOOLTOOL_DIR/clang/lib/clang/7.0.0/include -I$TOOLTOOL_DIR/clang/i686-w64-mingw32/include"
|
||||
|
||||
# Since we use windres from binutils without the rest of tools (like cpp), we need to
|
||||
# explicitly specify clang as a preprocessor.
|
||||
WINDRES="i686-w64-mingw32-windres --preprocessor=\"$CPP -xc\" -DRC_INVOKED"
|
||||
|
||||
# Bug 1471698 - Work around binutils corrupting mingw clang binaries.
|
||||
LDFLAGS="-Wl,-S"
|
||||
STRIP=/bin/true
|
||||
OBJCOPY=/bin/true
|
||||
|
||||
# We want to make sure we use binutils and other binaries in the tooltool
|
||||
# package.
|
||||
mk_add_options "export PATH=$TOOLTOOL_DIR/clang/bin:$TOOLTOOL_DIR/mingw32/bin:$TOOLTOOL_DIR/wine/bin:$TOOLTOOL_DIR/upx/bin:$TOOLTOOL_DIR/fxc2/bin:$PATH"
|
||||
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/mingw32/lib64:$TOOLTOOL_DIR/clang/lib
|
||||
mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
|
||||
|
||||
# Do not include the visual studio related mozconfigs of course
|
||||
|
||||
ac_add_options --with-branding=browser/branding/nightly
|
||||
|
||||
. "$topsrcdir/build/mozconfig.common.override"
|
||||
. "$topsrcdir/build/mozconfig.cache"
|
||||
@ -1,6 +0,0 @@
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/browser/config/mozconfigs/win32/mingwclang"
|
||||
|
||||
ac_add_options --enable-debug
|
||||
ac_add_options --disable-optimize
|
||||
@ -975,77 +975,6 @@ win32-mingw32/debug:
|
||||
- linux64-mingw32-fxc2
|
||||
- linux64-node
|
||||
|
||||
win32-mingwclang/opt:
|
||||
description: "Win32 MinGW-Clang Opt"
|
||||
index:
|
||||
product: firefox
|
||||
job-name: win32-mingwclang-opt
|
||||
treeherder:
|
||||
platform: windows-mingw32/all
|
||||
symbol: WMC32(Bo)
|
||||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 7200
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "opt 32 clang"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [build]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
- builds/releng_base_windows_32_mingw_builds.py
|
||||
- builds/releng_sub_windows_configs/32_mingwclang.py
|
||||
need-xvfb: false
|
||||
toolchains:
|
||||
- mingw32-rust
|
||||
- linux64-upx
|
||||
- linux64-wine
|
||||
- linux64-sccache
|
||||
- linux64-cbindgen
|
||||
- linux64-node
|
||||
- linux64-clang-7-mingw-x86
|
||||
- linux64-mingw32-nsis
|
||||
- linux64-mingw32-fxc2
|
||||
|
||||
win32-mingwclang/debug:
|
||||
description: "Win32 MinGW-Clang Debug"
|
||||
index:
|
||||
product: firefox
|
||||
job-name: win32-mingwclang-debug
|
||||
treeherder:
|
||||
platform: windows-mingw32/all
|
||||
symbol: WMC32(Bd)
|
||||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 72000
|
||||
env:
|
||||
PERFHERDER_EXTRA_OPTIONS: "debug 32 clang"
|
||||
run:
|
||||
using: mozharness
|
||||
actions: [build]
|
||||
script: mozharness/scripts/fx_desktop_build.py
|
||||
config:
|
||||
- builds/releng_base_firefox.py
|
||||
- builds/releng_base_windows_32_mingw_builds.py
|
||||
- builds/releng_sub_windows_configs/32_mingwclang.py
|
||||
- builds/releng_sub_windows_configs/32_mingwclang_debug.py
|
||||
need-xvfb: false
|
||||
toolchains:
|
||||
- mingw32-rust
|
||||
- linux64-upx
|
||||
- linux64-wine
|
||||
- linux64-sccache
|
||||
- linux64-cbindgen
|
||||
- linux64-node
|
||||
- linux64-clang-7-mingw-x86
|
||||
- linux64-mingw32-nsis
|
||||
- linux64-mingw32-fxc2
|
||||
|
||||
win64-mingwclang/opt:
|
||||
description: "Win64 MinGW-Clang Opt"
|
||||
index:
|
||||
|
||||
@ -68,7 +68,6 @@ treeherder:
|
||||
'TW64': 'Toolchain builds for Windows 64-bits'
|
||||
'WM32': 'MinGW builds for Windows 32-bits'
|
||||
'WM64': 'MinGW builds for Windows 64-bits'
|
||||
'WMC32': 'MinGW-Clang builds for Windows 32-bits'
|
||||
'WMC64': 'MinGW-Clang builds for Windows 64-bits'
|
||||
'Searchfox': 'Searchfox builds'
|
||||
'SM': 'Spidermonkey builds'
|
||||
|
||||
@ -10,12 +10,10 @@ elif [ "$1" == "x86" ]; then
|
||||
machine="i686"
|
||||
compiler_rt_machine="i386"
|
||||
crt_flags="--enable-lib32 --disable-lib64"
|
||||
WRAPPER_FLAGS="-fsjlj-exceptions"
|
||||
elif [ "$1" == "x64" ]; then
|
||||
machine="x86_64"
|
||||
compiler_rt_machine="x86_64"
|
||||
crt_flags="--disable-lib32 --enable-lib64"
|
||||
WRAPPER_FLAGS=""
|
||||
else
|
||||
echo "Provide either x86 or x64 to specify a toolchain."
|
||||
exit 1;
|
||||
@ -79,19 +77,17 @@ prepare() {
|
||||
install_wrappers() {
|
||||
pushd $INSTALL_DIR/bin
|
||||
|
||||
compiler_flags="--sysroot \$DIR/../$machine-w64-mingw32 -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld $WRAPPER_FLAGS -fuse-cxa-atexit -Qunused-arguments"
|
||||
|
||||
cat <<EOF >$machine-w64-mingw32-clang
|
||||
#!/bin/sh
|
||||
DIR="\$(cd "\$(dirname "\$0")" && pwd)"
|
||||
\$DIR/clang -target $machine-w64-mingw32 $compiler_flags "\$@"
|
||||
\$DIR/clang -target $machine-w64-mingw32 --sysroot \$DIR/../$machine-w64-mingw32 -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld -fdwarf-exceptions -Qunused-arguments "\$@"
|
||||
EOF
|
||||
chmod +x $machine-w64-mingw32-clang
|
||||
|
||||
cat <<EOF >$machine-w64-mingw32-clang++
|
||||
#!/bin/sh
|
||||
DIR="\$(cd "\$(dirname "\$0")" && pwd)"
|
||||
\$DIR/clang -target $machine-w64-mingw32 --driver-mode=g++ $compiler_flags "\$@"
|
||||
\$DIR/clang -target $machine-w64-mingw32 --sysroot \$DIR/../$machine-w64-mingw32 --driver-mode=g++ -rtlib=compiler-rt -stdlib=libc++ -fuse-ld=lld -fdwarf-exceptions -Qunused-arguments "\$@"
|
||||
EOF
|
||||
chmod +x $machine-w64-mingw32-clang++
|
||||
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
config = {
|
||||
'base_name': 'WINNT_5.2_MINGWCLANG_%(branch)s',
|
||||
'platform': 'win32-mingwclang',
|
||||
'stage_platform': 'win32-mingwclang',
|
||||
'mozconfig_platform': 'win32',
|
||||
'mozconfig_variant': 'mingwclang',
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
config = {
|
||||
'mozconfig_variant': 'mingwclang-debug',
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user