diff options
| author | emaste <emaste@FreeBSD.org> | 2015-05-15 14:22:33 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2015-05-15 14:22:33 +0000 |
| commit | dc3cd85736baf0aa316a834110dabbeb9add5dbb (patch) | |
| tree | 8b794ce14e74021bdaf52df9d509010b24ff21a1 | |
| parent | deecdc3d61efe21dd72ab03d04cea4a956bab557 (diff) | |
| download | FreeBSD-src-dc3cd85736baf0aa316a834110dabbeb9add5dbb.zip FreeBSD-src-dc3cd85736baf0aa316a834110dabbeb9add5dbb.tar.gz | |
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
| -rw-r--r-- | gnu/lib/Makefile | 6 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 373c280..6d28e13 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4a2ba751..ec22f63 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 |
