From 9ccb83609051803ec1fa85543d3f019a3dbd5903 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 22 Apr 2019 17:38:04 +0000 Subject: [PATCH] math/ceres-solver: don't force GCC for OpenMP on -CURRENT Limited to amd64 and i386. LLVM openmp doesn't support other architectures on FreeBSD (unlike Linux) but it's only important where Clang is default e.g., aarch64, armv6, armv7. --- graphics/colmap/Makefile | 2 ++ math/ceres-solver/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 38dfcd56b122..780615863b5f 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -49,8 +49,10 @@ DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP_ENABLED +.if !exists(/usr/include/omp.h) # XXX ports/199603 + ports/210337 OPENMP_VARS= OPENMP=gcc- +.endif SIMD_CMAKE_BOOL= SIMD_ENABLED diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 3f6890b50b35..b9526609543b 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -52,8 +52,10 @@ GFLAGS_CMAKE_BOOL= GFLAGS OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP +.if !exists(/usr/include/omp.h) # XXX ports/199603 + ports/210337 OPENMP_VARS= OPENMP=gcc- +.endif SCHUR_DESC= Fixed-size schur specializations SCHUR_CMAKE_BOOL= SCHUR_SPECIALIZATIONS