diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2020-11-16 11:38:51 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2020-11-16 11:38:51 +0000 |
| commit | d34f599cd2c84057a01daafcf2b1e51128bc87e9 (patch) | |
| tree | 2a0e2ef0b22f77435be54b9b2f5ec5d6f36bd366 /tools | |
| parent | 7eefcb5eead518d9db75411beece922618587297 (diff) | |
| download | src-test2-d34f599cd2c84057a01daafcf2b1e51128bc87e9.tar.gz src-test2-d34f599cd2c84057a01daafcf2b1e51128bc87e9.zip | |
Revert "When building on Ubuntu bootstrap bmake with bash as the default shell"
This reverts r365950 since the latest bmake update includes fixes for the test
failures that prompted the change.
Notes
Notes:
svn path=/head/; revision=367720
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build/make.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tools/build/make.py b/tools/build/make.py index 64f7af14a26f..7cfe8a0ee08f 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -81,14 +81,6 @@ def bootstrap_bmake(source_root, objdir_prefix): "--with-default-sys-path=" + str(bmake_install_dir / "share/mk"), "--with-machine=amd64", # TODO? "--with-machine-arch=amd64", "--without-filemon", "--prefix=" + str(bmake_install_dir)] - - if Path("/bin/sh").resolve().name == "dash": - # Note: we have to avoid using dash as the default shell since it - # filters out variables containing characters such as '-' and that - # breaks the bmake bootstrap tests. - # TODO: remove this when the bootstrap tests have been fixed. - configure_args.append("--with-defshell=/bin/bash") - run(["sh", bmake_source_dir / "boot-strap"] + configure_args, cwd=str(bmake_build_dir), env=env) |