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

Bug 1720820 - Remove python executable configuration from clang build script. r=firefox-build-system-reviewers,andi

Browse Source 
Clang >= 11 ignores PYTHON_EXECUTABLE entirely (and uses python3, which
is not even what we pass, but that's actually fine), and all the build
tasks we have on older versions find the python executable they need on
their own.

Differential Revision: https://phabricator.services.mozilla.com/D120049
This commit is contained in:
Mike Hommey
2021-07-17 04:29:10 +00:00
parent 00b7c9ade2
commit 2d5106dc7e
22 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/build-clang/README
View File

@@ -29,7 +29,6 @@ Config file format
build-clang.py accepts a JSON config format with the following fields: build-clang.py accepts a JSON config format with the following fields:
* stages: Use 1, 2, 3 or 4 to select different compiler stages. The default is 3. * stages: Use 1, 2, 3 or 4 to select different compiler stages. The default is 3.
* python_path: Path to the Python 2.7 installation on the machine building clang.
* cc: Path to the bootsraping C Compiler. * cc: Path to the bootsraping C Compiler.
* cxx: Path to the bootsraping C++ Compiler. * cxx: Path to the bootsraping C++ Compiler.
* as: Path to the assembler tool. * as: Path to the assembler tool.

10
build/build-clang/build-clang.py
View File

@@ -215,7 +215,6 @@ def build_one_stage(
osx_cross_compile, osx_cross_compile,
build_type, build_type,
assertions, assertions,
python_path,
libcxx_include_dir, libcxx_include_dir,
build_wasm, build_wasm,
compiler_rt_source_dir=None, compiler_rt_source_dir=None,
@@ -263,7 +262,6 @@ def build_one_stage(
"-DCMAKE_INSTALL_PREFIX=%s" % inst_dir, "-DCMAKE_INSTALL_PREFIX=%s" % inst_dir,
"-DLLVM_TARGETS_TO_BUILD=%s" % machine_targets, "-DLLVM_TARGETS_TO_BUILD=%s" % machine_targets,
"-DLLVM_ENABLE_ASSERTIONS=%s" % ("ON" if assertions else "OFF"), "-DLLVM_ENABLE_ASSERTIONS=%s" % ("ON" if assertions else "OFF"),
"-DPYTHON_EXECUTABLE=%s" % slashify_path(python_path),
"-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"), "-DLLVM_TOOL_LIBCXX_BUILD=%s" % ("ON" if build_libcxx else "OFF"),
"-DLLVM_ENABLE_BINDINGS=OFF", "-DLLVM_ENABLE_BINDINGS=OFF",
] ]
@@ -711,10 +709,6 @@ if __name__ == "__main__":
assertions = config["assertions"] assertions = config["assertions"]
if assertions not in (True, False): if assertions not in (True, False):
raise ValueError("Only boolean values are accepted for assertions.") raise ValueError("Only boolean values are accepted for assertions.")
python_path = None
if "python_path" not in config:
raise ValueError("Config file needs to set python_path")
python_path = config["python_path"]
ndk_dir = None ndk_dir = None
android_targets = None android_targets = None
if "android_targets" in config: if "android_targets" in config:
@@ -884,7 +878,6 @@ if __name__ == "__main__":
osx_cross_compile, osx_cross_compile,
build_type, build_type,
assertions, assertions,
python_path,
libcxx_include_dir, libcxx_include_dir,
build_wasm, build_wasm,
is_final_stage=(stages == 1), is_final_stage=(stages == 1),
@@ -913,7 +906,6 @@ if __name__ == "__main__":
osx_cross_compile, osx_cross_compile,
build_type, build_type,
assertions, assertions,
python_path,
libcxx_include_dir, libcxx_include_dir,
build_wasm, build_wasm,
compiler_rt_source_dir, compiler_rt_source_dir,
@@ -945,7 +937,6 @@ if __name__ == "__main__":
osx_cross_compile, osx_cross_compile,
build_type, build_type,
assertions, assertions,
python_path,
libcxx_include_dir, libcxx_include_dir,
build_wasm, build_wasm,
compiler_rt_source_dir, compiler_rt_source_dir,
@@ -986,7 +977,6 @@ if __name__ == "__main__":
osx_cross_compile, osx_cross_compile,
build_type, build_type,
assertions, assertions,
python_path,
libcxx_include_dir, libcxx_include_dir,
build_wasm, build_wasm,
compiler_rt_source_dir, compiler_rt_source_dir,

1
build/build-clang/clang-10-linux64.json
View File

@@ -5,7 +5,6 @@
"build_wasm": true, "build_wasm": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-11-android.json
View File

@@ -3,7 +3,6 @@
"build_libcxx": true, "build_libcxx": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-11-linux64.json
View File

@@ -5,7 +5,6 @@
"build_wasm": true, "build_wasm": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-11-macosx64.json
View File

@@ -4,7 +4,6 @@
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"osx_cross_compile": true, "osx_cross_compile": true,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang", "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++", "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang", "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",

1
build/build-clang/clang-11-win64-2stage.json
View File

@@ -3,7 +3,6 @@
"build_libcxx": false, "build_libcxx": false,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "c:/mozilla-build/python/python.exe",
"cc": "cl.exe", "cc": "cl.exe",
"cxx": "cl.exe", "cxx": "cl.exe",
"ml": "ml64.exe", "ml": "ml64.exe",

1
build/build-clang/clang-11-win64.json
View File

@@ -4,7 +4,6 @@
"build_libcxx": false, "build_libcxx": false,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "c:/mozilla-build/python/python.exe",
"cc": "cl.exe", "cc": "cl.exe",
"cxx": "cl.exe", "cxx": "cl.exe",
"ml": "ml64.exe", "ml": "ml64.exe",

1
build/build-clang/clang-12-android.json
View File

@@ -3,7 +3,6 @@
"build_libcxx": true, "build_libcxx": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-12-linux64.json
View File

@@ -5,7 +5,6 @@
"build_wasm": true, "build_wasm": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-12-macosx64.json
View File

@@ -4,7 +4,6 @@
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"osx_cross_compile": true, "osx_cross_compile": true,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang", "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++", "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang", "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",

1
build/build-clang/clang-12-mingw.json
View File

@@ -4,7 +4,6 @@
"build_libcxx": true, "build_libcxx": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-12-win64-2stage.json
View File

@@ -3,7 +3,6 @@
"build_libcxx": false, "build_libcxx": false,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "c:/mozilla-build/python/python.exe",
"cc": "cl.exe", "cc": "cl.exe",
"cxx": "cl.exe", "cxx": "cl.exe",
"ml": "ml64.exe", "ml": "ml64.exe",

1
build/build-clang/clang-12-win64.json
View File

@@ -4,7 +4,6 @@
"build_libcxx": false, "build_libcxx": false,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "c:/mozilla-build/python/python.exe",
"cc": "cl.exe", "cc": "cl.exe",
"cxx": "cl.exe", "cxx": "cl.exe",
"ml": "ml64.exe", "ml": "ml64.exe",

1
build/build-clang/clang-5.0-linux64.json
View File

@@ -3,7 +3,6 @@
"build_libcxx": true, "build_libcxx": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-7-linux64.json
View File

@@ -3,7 +3,6 @@
"build_libcxx": true, "build_libcxx": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-linux64.json
View File

@@ -5,7 +5,6 @@
"build_wasm": true, "build_wasm": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-tidy-external-linux64.json
View File

@@ -4,7 +4,6 @@
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"build_clang_tidy": true, "build_clang_tidy": true,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-tidy-linux64.json
View File

@@ -4,7 +4,6 @@
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"build_clang_tidy": true, "build_clang_tidy": true,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",

1
build/build-clang/clang-tidy-macosx64.json
View File

@@ -5,7 +5,6 @@
"assertions": false, "assertions": false,
"build_clang_tidy": true, "build_clang_tidy": true,
"osx_cross_compile": true, "osx_cross_compile": true,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/clang/bin/clang", "cc": "{MOZ_FETCHES_DIR}/clang/bin/clang",
"cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++", "cxx": "{MOZ_FETCHES_DIR}/clang/bin/clang++",
"as": "{MOZ_FETCHES_DIR}/clang/bin/clang", "as": "{MOZ_FETCHES_DIR}/clang/bin/clang",

1
build/build-clang/clang-tidy-win64.json
View File

@@ -4,7 +4,6 @@
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"build_clang_tidy": true, "build_clang_tidy": true,
"python_path": "c:/mozilla-build/python/python.exe",
"cc": "cl.exe", "cc": "cl.exe",
"cxx": "cl.exe", "cxx": "cl.exe",
"ml": "ml64.exe", "ml": "ml64.exe",

1
build/build-clang/clang-trunk-linux64.json
View File

@@ -4,7 +4,6 @@
"build_wasm": true, "build_wasm": true,
"build_type": "Release", "build_type": "Release",
"assertions": false, "assertions": false,
"python_path": "/usr/bin/python2.7",
"cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
"cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++", "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
"as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc", "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",