svn commit: r358907 - head

Dimitry Andric dim at FreeBSD.org
Thu Mar 12 11:39:07 UTC 2020


Author: dim
Date: Thu Mar 12 11:39:04 2020
New Revision: 358907
URL: https://svnweb.freebsd.org/changeset/base/358907

Log:
  Allow -DNO_CLEAN build across r358851.
  
  The openmp 10.0.0 import renamed one .c file to .cpp, and this is
  something our dependency system does not handle correctly.  Add another
  ad-hoc cleanup to get rid of the stale dependency.
  
  PR:		244251
  MFC after:	6 weeks
  X-MFC-With:	358851

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Mar 12 06:45:08 2020	(r358906)
+++ head/Makefile.inc1	Thu Mar 12 11:39:04 2020	(r358907)
@@ -924,6 +924,15 @@ _sanity_check: .PHONY .MAKE
 _cleanobj_fast_depend_hack: .PHONY
 # Syscall stubs rewritten in C and obsolete MD assembly implementations
 # Date      SVN Rev  Syscalls/Changes
+# 20200310  r358851  rename of openmp's ittnotify_static.c to .cpp
+.for f in ittnotify_static
+	@if [ -e "${OBJTOP}/lib/libomp/.depend.${f}.pico" ] && \
+	    egrep -qw '${f}\.c' ${OBJTOP}/lib/libomp/.depend.${f}.pico; then \
+		echo "Removing stale dependencies for ${f}"; \
+		rm -f ${OBJTOP}/lib/libomp/.depend.${f}.* \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libomp/.depend.${f}.*}; \
+	fi
+.endfor
 # 20191009  r353340  removal of opensolaris_atomic.S (also r353381)
 .if ${MACHINE} != i386
 .for f in opensolaris_atomic


More information about the svn-src-head mailing list