diff --git a/algebra/algebralib/src/ErrorHandling.cpp b/algebra/algebralib/src/ErrorHandling.cpp index de58513..247a031 100644 --- a/algebra/algebralib/src/ErrorHandling.cpp +++ b/algebra/algebralib/src/ErrorHandling.cpp @@ -79,7 +79,7 @@ namespace Algebra{ } void ErrorHandling::printStacktrace() { -#ifdef __GNUC__ +#if defined (__GNUC__) && !defined (__APPLE__) std::cerr << "Stack trace (pipe through c++filt to demangle identifiers):" << std::endl; const int maxFrames = 100; void* frames[maxFrames]; diff --git a/flags.mk b/flags.mk index a04d731..8c87252 100644 --- a/flags.mk +++ b/flags.mk @@ -1,3 +1,3 @@ -CC=g++ +CC=g++-7.3.0 CPPFLAGS=-std=c++11 CFLAGS=-O3 -g -Wall -fmessage-length=0 -fopenmp -maes -msse4 -mtune=native diff --git a/libstark/src/common/Utils/ErrorHandling.cpp b/libstark/src/common/Utils/ErrorHandling.cpp index bce77a5..d38e409 100644 --- a/libstark/src/common/Utils/ErrorHandling.cpp +++ b/libstark/src/common/Utils/ErrorHandling.cpp @@ -51,7 +51,7 @@ void ErrorHandling::info(const stringstream& msg) { } void ErrorHandling::printStacktrace() { -#ifdef __GNUC__ +#if defined (__GNUC__) && !defined (__APPLE__) cerr << "Stack trace (pipe through c++filt to demangle identifiers):" << endl; const int maxFrames = 100; void* frames[maxFrames]; diff --git a/libstark/src/protocols/Ali/prover.cpp b/libstark/src/protocols/Ali/prover.cpp index 7f3dba3..c1b9ea9 100644 --- a/libstark/src/protocols/Ali/prover.cpp +++ b/libstark/src/protocols/Ali/prover.cpp @@ -5,7 +5,7 @@ #include "protocols/Fri/prover.hpp" #include -#if __GNUG__ +#if defined (__GNUG__) && !defined (__APPLE__) #include #endif @@ -162,7 +162,7 @@ namespace{ unsigned short logVM; //compute RAM amount on current machine { -#if __GNUG__ +#if defined (__GNUG__) && !defined (__APPLE__) struct sysinfo info; sysinfo(&info); logRAM = std::floor(Log2(info.totalram)); @@ -578,7 +578,7 @@ namespace{ unsigned short logRAM; //compute RAM amount on current machine { -#if __GNUG__ +#if defined (__GNUG__) && !defined (__APPLE__) struct sysinfo info; sysinfo(&info); logRAM = Log2(std::round(info.totalram)); diff --git a/tinyram/gadgetlib/gadgetlib/infrastructure.cpp b/tinyram/gadgetlib/gadgetlib/infrastructure.cpp index 7517972..daf2945 100644 --- a/tinyram/gadgetlib/gadgetlib/infrastructure.cpp +++ b/tinyram/gadgetlib/gadgetlib/infrastructure.cpp @@ -81,7 +81,7 @@ namespace gadgetlib { } void ErrorHandling::printStacktrace() { -#ifdef __GNUC__ +#if defined (__GNUC__) && !defined (__APPLE__) std::cerr << "Stack trace (pipe through c++filt to demangle identifiers):" << std::endl; const int maxFrames = 100; void* frames[maxFrames];