Skip to content

Commit

Permalink
Revert "Check if OpenMP is available before using it"
Browse files Browse the repository at this point in the history
This reverts commit daad2c2.
  • Loading branch information
str4d committed Aug 22, 2019
1 parent 9a0e257 commit 7bd700b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 136 deletions.
123 changes: 0 additions & 123 deletions build-aux/m4/ax_openmp.m4

This file was deleted.

10 changes: 0 additions & 10 deletions configure.ac
Expand Up @@ -750,16 +750,6 @@ case $host in
;;
esac

dnl Check for OpenMP support
AX_OPENMP(
[AC_DEFINE(HAVE_OPENMP, 1, [Define if OpenMP is enabled])
AM_CONDITIONAL([HAVE_OPENMP], [true])
CPPFLAGS="$CPPFLAGS -DMULTICORE"
CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"],
[AC_MSG_WARN([OpenMP not supported, disabling multithreading])
AC_DEFINE(HAVE_OPENMP, 0, [Define if OpenMP is enabled])
AM_CONDITIONAL([HAVE_OPENMP], [false])])

# Gitian uses a config.site that sets depends_prefix, and then sets --prefix=/
# build.sh just uses --prefix
if test x$depends_prefix != x; then
Expand Down
3 changes: 0 additions & 3 deletions src/Makefile.am
Expand Up @@ -62,9 +62,6 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)

LIBSNARK_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all
LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1
if HAVE_OPENMP
LIBSNARK_CONFIG_FLAGS += MULTICORE=1
endif
if TARGET_DARWIN
LIBSNARK_CONFIG_FLAGS += PLATFORM=darwin
endif
Expand Down

0 comments on commit 7bd700b

Please sign in to comment.