Date: Fri, 14 Aug 2020 09:45:41 +0000 (UTC) From: Alex Richardson <arichardson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364234 - in head: tools/build usr.sbin/crunch/crunchgen Message-ID: <202008140945.07E9jfCj057652@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arichardson Date: Fri Aug 14 09:45:41 2020 New Revision: 364234 URL: https://svnweb.freebsd.org/changeset/base/364234 Log: crunchgen: use pwd -P without env 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 Modified: head/tools/build/Makefile head/usr.sbin/crunch/crunchgen/crunchgen.c Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Fri Aug 14 08:49:40 2020 (r364233) +++ head/tools/build/Makefile Fri Aug 14 09:45:41 2020 (r364234) @@ -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 Modified: head/usr.sbin/crunch/crunchgen/crunchgen.c ============================================================================== --- head/usr.sbin/crunch/crunchgen/crunchgen.c Fri Aug 14 08:49:40 2020 (r364233) +++ head/usr.sbin/crunch/crunchgen/crunchgen.c Fri Aug 14 09:45:41 2020 (r364234) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008140945.07E9jfCj057652>