corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1795207 - Move the remainder of warning flags setup in old-configure to python. r=firefox-build-system-reviewers,andi

Browse Source 
While we're here, make the setup more consistent across host/target
c/c++, and remove the C compiler warning flags from the C linker flags,
where they are irrelevant.

Differential Revision: https://phabricator.services.mozilla.com/D159358
This commit is contained in:
Mike Hommey
2022-10-18 19:46:44 +00:00
parent ea649556c0
commit 9ba04bac85
9 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/mozbuild/mozbuild/frontend/context.py
View File

@@ -380,6 +380,16 @@ class HostCompileFlags(BaseCompileFlags):
["-I%s/dist/include" % context.config.topobjdir],
("HOST_CFLAGS", "HOST_CXXFLAGS"),
),
(
"WARNINGS_CFLAGS",
context.config.substs.get("WARNINGS_HOST_CFLAGS"),
("HOST_CFLAGS",),
),
(
"WARNINGS_CXXFLAGS",
context.config.substs.get("WARNINGS_HOST_CXXFLAGS"),
("HOST_CXXFLAGS",),
),
)
BaseCompileFlags.__init__(self, context)
@@ -645,7 +655,12 @@ class CompileFlags(TargetCompileFlags):
(
"WARNINGS_CFLAGS",
context.config.substs.get("WARNINGS_CFLAGS"),
("CFLAGS", "C_LDFLAGS"),
("CFLAGS",),
),
(
"WARNINGS_CXXFLAGS",
context.config.substs.get("WARNINGS_CXXFLAGS"),
("CXXFLAGS",),
),
("MOZBUILD_CFLAGS", None, ("CFLAGS",)),
("MOZBUILD_CXXFLAGS", None, ("CXXFLAGS",)),

16
python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
View File

@@ -494,14 +494,14 @@ class LinuxToolchainTest(BaseToolchainTest):
"Only clang/llvm 5.0 or newer is supported (found version 4.0.2)."
)
CLANG_5_0_RESULT = CompilerResult(
flags=["-std=gnu99"],
flags=["-Qunused-arguments", "-std=gnu99"],
version="5.0.1",
type="clang",
compiler="/usr/bin/clang-5.0",
language="C",
)
CLANGXX_5_0_RESULT = CompilerResult(
flags=["-std=gnu++17"],
flags=["-Qunused-arguments", "-std=gnu++17"],
version="5.0.1",
type="clang",
compiler="/usr/bin/clang++-5.0",
@@ -867,14 +867,14 @@ class OSXToolchainTest(BaseToolchainTest):
"Only clang/llvm 5.0 or newer is supported (found version 4.0.0.or.less)."
)
DEFAULT_CLANG_RESULT = CompilerResult(
flags=["-std=gnu99"],
flags=["-Qunused-arguments", "-std=gnu99"],
version="5.0.2",
type="clang",
compiler="/usr/bin/clang",
language="C",
)
DEFAULT_CLANGXX_RESULT = CompilerResult(
flags=["-stdlib=libc++", "-std=gnu++17"],
flags=["-stdlib=libc++", "-Qunused-arguments", "-std=gnu++17"],
version="5.0.2",
type="clang",
compiler="/usr/bin/clang++",
@@ -987,7 +987,7 @@ class WindowsToolchainTest(BaseToolchainTest):
)
CLANG_CL_8_0_RESULT = CompilerResult(
version="8.0.0",
flags=["-Xclang", "-std=gnu99"],
flags=["-Qunused-arguments", "-Xclang", "-std=gnu99"],
type="clang-cl",
compiler="/usr/bin/clang-cl",
language="C",
@@ -997,7 +997,7 @@ class WindowsToolchainTest(BaseToolchainTest):
)
CLANGXX_CL_8_0_RESULT = CompilerResult(
version="8.0.0",
flags=["-Xclang", "-std=c++17"],
flags=["-Qunused-arguments", "-Xclang", "-std=c++17"],
type="clang-cl",
compiler="/usr/bin/clang-cl",
language="C++",
@@ -1433,14 +1433,14 @@ class OSXCrossToolchainTest(BaseToolchainTest):
}
)
DEFAULT_CLANG_RESULT = CompilerResult(
flags=["-std=gnu99"],
flags=["-Qunused-arguments", "-std=gnu99"],
version="5.0.1",
type="clang",
compiler="/usr/bin/clang",
language="C",
)
DEFAULT_CLANGXX_RESULT = CompilerResult(
flags=["-std=gnu++17"],
flags=["-Qunused-arguments", "-std=gnu++17"],
version="5.0.1",
type="clang",
compiler="/usr/bin/clang++",