diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-03-16 15:45:15 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-03-16 15:45:15 +0000 |
| commit | b0840a28f6f663602c7cabade8c716e3e7eec27c (patch) | |
| tree | f2a8b128da9ea835307f63dc4c0b186c83deca56 /gnu | |
| parent | 3c6bb67129ec4221ba5138534771891947225c42 (diff) | |
| download | src-b0840a28f6f663602c7cabade8c716e3e7eec27c.tar.gz src-b0840a28f6f663602c7cabade8c716e3e7eec27c.zip | |
Connect lib/libomp to the build.
* Set MK_OPENMP to yes by default only on amd64, for now.
* Bump __FreeBSD_version to signal this addition.
* Ensure gcc's conflicting omp.h is not installed if MK_OPENMP is yes.
* Update OptionalObsoleteFiles.inc to cope with the conflicting omp.h.
* Regenerate src.conf(5) with new WITH/WITHOUT fragments.
Relnotes: yes
PR: 236062
MFC after: 1 month
X-MFC-With: r344779
Notes
Notes:
svn path=/head/; revision=345236
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 6dbef4d4065b..2cbb80cc7dcf 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -4,7 +4,10 @@ SUBDIR= SUBDIR.${MK_DIALOG}+= libdialog -SUBDIR.${MK_GCC}+= libgcov libgomp +SUBDIR.${MK_GCC}+= libgcov +.if ${MK_GCC} != "no" && ${MK_OPENMP} == "no" +SUBDIR+= libgomp +.endif SUBDIR.${MK_SSP}+= libssp SUBDIR.${MK_TESTS}+= tests |