#!/bin/bash set -e -v # This is shared code for building GN. cd $MOZ_FETCHES_DIR/gn # We remove /WC because of https://bugs.chromium.org/p/gn/issues/detail?id=51 # And /MACHINE:x64 because we just let the PATH decide what cl and link are # used, and if cl is targetting x86, we don't want linkage to fail because of # /MACHINE:x64. patch -p1 <<'EOF' diff --git a/build/gen.py b/build/gen.py index a7142fab..78d0fd56 100755 --- a/build/gen.py +++ b/build/gen.py @@ -357,7 +357,6 @@ def WriteGNNinja(path, platform, host, options): '/D_WIN32_WINNT=0x0A00', '/FS', '/W4', - '/WX', '/Zi', '/wd4099', '/wd4100', @@ -373,7 +372,7 @@ def WriteGNNinja(path, platform, host, options): '/D_HAS_EXCEPTIONS=0', ]) - ldflags.extend(['/DEBUG', '/MACHINE:x64']) + ldflags.extend(['/DEBUG']) static_libraries = { 'base': {'sources': [ EOF if test -n "$MAC_CROSS"; then python build/gen.py --platform darwin --no-last-commit-position else python build/gen.py --no-last-commit-position fi cat > out/last_commit_position.h <