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

crunchgen: use pwd -P without env

Browse Source 
The -P flag is required by POSIX so we don't have to care whether pwd is
a shell builtin or not. This also allows removing pwd from the list of
bootstrap tools since all shells we care about for building have a
builtin pwd command. This effectively reverts r364190.

Suggested By:	rgrimes, jrtc27
This commit is contained in:
Alex Richardson 2020-08-14 09:45:41 +00:00
parent 9b9210015d
commit 0d5e651861
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364234
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build/Makefile
View File

@ -113,7 +113,7 @@ SYSINCS+= ${SRCTOP}/sys/sys/font.h
# Linux/MacOS since we only use flags that are supported by all of them.
_host_tools_to_symlink= basename bzip2 bunzip2 chmod chown cmp comm cp date dd \
dirname echo env false find fmt gzip gunzip head hostname id ln ls \
mkdir mv nice patch pwd rm realpath sh sleep stat tee touch tr true \
mkdir mv nice patch rm realpath sh sleep stat tee touch tr true \
uname uniq wc which
# We also need a symlink to the absolute path to the make binary used for

2
usr.sbin/crunch/crunchgen/crunchgen.c
View File

@ -653,7 +653,7 @@ fillin_program(prog_t *p)
/* Determine the actual srcdir (maybe symlinked). */
if (p->srcdir) {
snprintf(line, MAXLINELEN, "cd %s && env pwd -P", p->srcdir);
snprintf(line, MAXLINELEN, "cd %s && pwd -P", p->srcdir);
f = popen(line,"r");
if (!f)
errx(1, "Can't execute: %s\n", line);