svn commit: r364701 - in head: . tools/build

Warner Losh imp at FreeBSD.org
Mon Aug 24 16:06:12 UTC 2020


Author: imp
Date: Mon Aug 24 16:06:11 2020
New Revision: 364701
URL: https://svnweb.freebsd.org/changeset/base/364701

Log:
  When copying over the binaries, use '-p' to preserve date/time
  
  Although I can't reproduce it, others are seeing different lex/yacc
  programs always regenerated after my change to copy rather than
  symlink the files. The reported fix is to add '-p' to the copies.
  Since it doesn't hurt, go head and add it, though the reasons for
  this mattering remain at best obscure and poorly articulated.

Modified:
  head/Makefile.inc1
  head/tools/build/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Aug 24 16:00:58 2020	(r364700)
+++ head/Makefile.inc1	Mon Aug 24 16:06:11 2020	(r364701)
@@ -2319,7 +2319,7 @@ ${_bt}-link-${_tool}: .PHONY .MAKE
 	if [ ! -e "$${source_path}" ] ; then \
 		echo "Cannot find host tool '${_tool}'"; false; \
 	fi; \
-	cp -f "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}"
+	cp -pf "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}"
 ${_bt}-links: ${_bt}-link-${_tool}
 .endfor
 

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Mon Aug 24 16:00:58 2020	(r364700)
+++ head/tools/build/Makefile	Mon Aug 24 16:06:11 2020	(r364701)
@@ -130,7 +130,7 @@ host-symlinks:
 		echo "Cannot find host tool '${_tool}'"; false; \
 	fi; \
 	rm -f "${DESTDIR}/bin/${_tool}"; \
-	cp -f "$${source_path}" "${DESTDIR}/bin/${_tool}"
+	cp -pf "$${source_path}" "${DESTDIR}/bin/${_tool}"
 .endfor
 .for _tool in ${_host_abs_tools_to_symlink}
 	@source_path="${_tool:S/:/ /:[1]}"; \
@@ -139,11 +139,11 @@ host-symlinks:
 		echo "Host tool '${src_path}' is missing"; false; \
 	fi; \
 	rm -f "$${target_path}"; \
-	cp -f "$${source_path}" "$${target_path}"
+	cp -pf "$${source_path}" "$${target_path}"
 .endfor
 .if exists(/usr/libexec/flua)
 	rm -f ${DESTDIR}/usr/libexec/flua
-	cp -f /usr/libexec/flua ${DESTDIR}/usr/libexec/flua
+	cp -pf /usr/libexec/flua ${DESTDIR}/usr/libexec/flua
 .endif
 
 # Create all the directories that are needed during the legacy, bootstrap-tools


More information about the svn-src-all mailing list