summaryrefslogtreecommitdiffstats
path: root/package/fftw
diff options
context:
space:
mode:
authorAndré Hentschel <nerv@dawncrow.de>2016-06-22 19:00:16 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-02 15:42:16 +0200
commit0f163c819c4d8ee76c317ce45e71c9267bae28c1 (patch)
treef2a64d98dd5f77d171e50451830ea3b67c2b0afe /package/fftw
parentd7dd1b8ad113b56cac164df50f521e0684263624 (diff)
downloadbuildroot-0f163c819c4d8ee76c317ce45e71c9267bae28c1.tar.gz
buildroot-0f163c819c4d8ee76c317ce45e71c9267bae28c1.zip
fftw: Disable combined threads when building with OpenMP support
Otherwise fftw fails to configure: configure: error: --with-combined-threads incompatible with --enable-openmp Signed-off-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/fftw')
-rw-r--r--package/fftw/fftw.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index 5045ab6fed..e89671f9e2 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -31,7 +31,8 @@ FFTW_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon)
# Generic optimisations
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-FFTW_CONF_OPTS += --enable-threads --with-combined-threads
+FFTW_CONF_OPTS += --enable-threads
+FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
else
FFTW_CONF_OPTS += --disable-threads
endif
OpenPOWER on IntegriCloud