d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "When building on Ubuntu bootstrap bmake with bash as the default shell"

Browse Source 
This reverts r365950 since the latest bmake update includes fixes for the test
failures that prompted the change.
This commit is contained in:
Alex Richardson 2020-11-16 11:38:51 +00:00
parent 7eefcb5eea
commit d34f599cd2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367720
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/build/make.py
View File

@ -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)