svn commit: r282973 - in head: gnu/lib tools/build/mk

[Ed Maste]

Author: emaste
Date: Fri May 15 14:22:33 2015
New Revision: 282973
URL: https://svnweb.freebsd.org/changeset/base/282973

Log:
  Build libgomp only if we're also building base system GCC
  
  Clang's OpenMP support will emit Intel OpenMP API library calls,
  and will therefore require libiomp (or whatever name is settled on).
  An up-to-date version of libgomp is included in ports or pkg GCC.
  Thus, there is no reason to build base libgomp without base system GCC.
  
  PR:		199979 (exp-run)
  Reviewed by:	pfg
  Relnotes:	Yes
  Sponsored by:	The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D2459

Modified:
  head/gnu/lib/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile	Fri May 15 13:55:18 2015	(r282972)
+++ head/gnu/lib/Makefile	Fri May 15 14:22:33 2015	(r282973)
@@ -2,7 +2,11 @@
 
 .include <src.opts.mk>
 
-SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline
+SUBDIR= csu libgcc libgcov libdialog libregex libreadline
+
+.if ${MK_GCC} != "no"
+SUBDIR+= libgomp
+.endif
 
 .if ${MK_SSP} != "no"
 SUBDIR+= libssp

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May 15 13:55:18 2015	(r282972)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May 15 14:22:33 2015	(r282973)
@@ -1743,6 +1743,11 @@ OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
+OLD_FILES+=usr/include/omp.h
+OLD_FILES+=usr/lib/libgomp.a
+OLD_FILES+=usr/lib/libgomp.so
+OLD_FILES+=usr/lib/libgomp.so.1
+OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/info/cpp.info.gz