svn commit: r359088 - head/share/mk

Ed Maste emaste at FreeBSD.org
Wed Mar 18 21:15:46 UTC 2020


Author: emaste
Date: Wed Mar 18 21:15:45 2020
New Revision: 359088
URL: https://svnweb.freebsd.org/changeset/base/359088

Log:
  src.opts.mk: drop C++11 compiler conditional from OPENMP
  
  We no longer support older C++ compilers, so do not need to explicitly
  test for C++11 support.
  
  After r339946 we stopped running `cc --version` during cleandir/obj
  stages, so stopped setting COMPILER_FEATURES.  This in turn meant
  lib/libomp was excluded from the clean stage in a normal buildworld
  (i.e., one without -DNO_CLEAN), and this is what caused recent build
  failures with errors about missing ittnotify_static.c.
  
  This commit should obviate the need for the workaround committed in
  r359083.  Thanks to bdrewery for the insight and for pushing for a
  correct fix.  There are more cleanups to be done, but this change is
  a simplification and an improvement over r359083.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Wed Mar 18 20:50:30 2020	(r359087)
+++ head/share/mk/src.opts.mk	Wed Mar 18 21:15:45 2020	(r359088)
@@ -377,8 +377,7 @@ BROKEN_OPTIONS+=HYPERV
 BROKEN_OPTIONS+=NVME
 .endif
 
-.if ${COMPILER_FEATURES:Mc++11} && \
-    (${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc64")
+.if ${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc64"
 __DEFAULT_YES_OPTIONS+=OPENMP
 .else
 __DEFAULT_NO_OPTIONS+=OPENMP


More information about the svn-src-all mailing list