Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 May 2017 00:51:05 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r318912 - head
Message-ID:  <201705260051.v4Q0p5XM013300@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Fri May 26 00:51:05 2017
New Revision: 318912
URL: https://svnweb.freebsd.org/changeset/base/318912

Log:
  libc: rm stale generated files which are no longer syscalls
  
  This is an attempt to help -DNO_CLEAN builds after r302092 (which
  removed the pipe libc syscall wrapper) and r318736 (which removed
  getdents, lstat, mknod, and stat).
  
  Dependencies cannot cope with certain source tree changes,
  particularly with respect to removing source files and replacing
  generated files.  Handle these cases from _worldtmp in an ad-hoc
  fashion.
  
  Reviewed by:	bdrewery, cem
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D10876

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri May 26 00:48:21 2017	(r318911)
+++ head/Makefile.inc1	Fri May 26 00:51:05 2017	(r318912)
@@ -707,6 +707,21 @@ _worldtmp: .PHONY
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
 .endif
+# Dependencies cannot cope with certain source tree changes, particularly
+# with respect to removing source files and replacing generated files.
+# Handle these cases here in an ad-hoc fashion.
+# 20170523 remove stale generated asm files for functions which are no longer
+# syscalls after r302092 (pipe) and r318736 (others)
+.for f in getdents lstat mknod pipe stat
+.if exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.s) || \
+    exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.S)
+	@echo Removing stale generated ${f} syscall files
+	@rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \
+	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
+	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/${f}.* \
+	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*
+.endif
+.endfor
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705260051.v4Q0p5XM013300>