macOS.diff

diff --git a/algebra/algebralib-tests/Makefile b/algebra/algebralib-tests/Makefile
index 26c18a1..2fd29fc 100644
--- a/algebra/algebralib-tests/Makefile
+++ b/algebra/algebralib-tests/Makefile
@@ -35,5 +35,5 @@ clean:
 $(TARGET): $(OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC Linker'
-	$(CC) -o "$@" $(OBJS) -fopenmp $(LNKFLAGS) $(LIBFLAGS)
+	$(CC) -o "$@" $(OBJS) -Xpreprocessor -fopenmp $(LNKFLAGS) $(LIBFLAGS)
 	@echo 'Finished building target: $@'
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..7d88f28 100644
--- a/flags.mk
+++ b/flags.mk
@@ -1,3 +1,3 @@
 CC=g++
 CPPFLAGS=-std=c++11
-CFLAGS=-O3 -g -Wall -fmessage-length=0 -fopenmp -maes -msse4 -mtune=native
+CFLAGS=-O3 -g -Wall -fmessage-length=0 -Xpreprocessor -fopenmp -maes -msse4 -mtune=native
diff --git a/libstark-tests/Makefile b/libstark-tests/Makefile
index 18d4b39..af3c066 100644
--- a/libstark-tests/Makefile
+++ b/libstark-tests/Makefile
@@ -28,7 +28,7 @@ all: $(TARGET)
 $(TARGET): buildrepo $(OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: GCC Linker'
-	$(CC) -o "$@" $(OBJS) -fopenmp $(LNKFLAGS) $(LIBFLAGS)
+	$(CC) -o "$@" $(OBJS) -Xpreprocessor -fopenmp $(LNKFLAGS) $(LIBFLAGS)
 	@echo 'Finished building target: $@'
 
 $(OBJDIR)/%.o: %.$(SRCEXT)
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 dcd5dca..9390ead 100644
--- a/libstark/src/protocols/Ali/prover.cpp
+++ b/libstark/src/protocols/Ali/prover.cpp
@@ -6,7 +6,7 @@
 #include "reductions/BairToAcsp/BairToAcsp.hpp"
 
 #include <set>
-#if __GNUG__
+#if defined (__GNUG__) && !defined (__APPLE__)
 #include <sys/sysinfo.h>
 #endif
 
@@ -165,7 +165,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));
@@ -585,7 +585,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/starkdpm/Makefile b/starkdpm/Makefile
index 65a4d5d..8aa1615 100644
--- a/starkdpm/Makefile
+++ b/starkdpm/Makefile
@@ -28,7 +28,7 @@ all: $(TARGET)
 $(TARGET): buildrepo $(OBJS)
 #	@echo 'Building target: $@'
 #	@echo 'Invoking: GCC Linker'
-	$(CC) -o "$@" $(OBJS) -fopenmp $(LNKFLAGS) $(LIBFLAGS)
+	$(CC) -o "$@" $(OBJS) -Xpreprocessor -fopenmp $(LNKFLAGS) $(LIBFLAGS)
 #	@echo 'Finished building target: $@'
 	cp $(TARGET) $(DST)
 
diff --git a/tinyram/gadgetlib/gadgetlib/infrastructure.cpp b/tinyram/gadgetlib/gadgetlib/infrastructure.cpp
index 7517972..7254bde 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 (__GNUG__) && !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/tinyram/stark-tinyram-tests/Makefile b/tinyram/stark-tinyram-tests/Makefile
index d5ecad9..517c84b 100644
--- a/tinyram/stark-tinyram-tests/Makefile
+++ b/tinyram/stark-tinyram-tests/Makefile
@@ -25,7 +25,7 @@ all: $(TARGET)
 $(TARGET): $(OBJS)
 #	@echo 'Building target: $@'
 #	@echo 'Invoking: GCC Linker'
-	$(CC) -o "$@" $(OBJS) $(TINYRAMOBJS) -fopenmp $(LNKFLAGS) $(LIBFLAGS)
+	$(CC) -o "$@" $(OBJS) $(TINYRAMOBJS) -Xpreprocessor -fopenmp $(LNKFLAGS) $(LIBFLAGS)
 #	@echo 'Finished building target: $@'
 
 $(BLDDIR)/%.o: %.cpp
diff --git a/tinyram/stark-tinyram/Makefile b/tinyram/stark-tinyram/Makefile
index 0cffa05..33c9658 100644
--- a/tinyram/stark-tinyram/Makefile
+++ b/tinyram/stark-tinyram/Makefile
@@ -25,7 +25,7 @@ all: $(TARGET)
 $(TARGET): buildrepo $(OBJS)
 #	@echo 'Building target: $@'
 #	@echo 'Invoking: GCC Linker'
-	$(CC) -o "$@" $(OBJS) -fopenmp $(LNKFLAGS) $(LIBFLAGS)
+	$(CC) -o "$@" $(OBJS) -Xpreprocessor -fopenmp $(LNKFLAGS) $(LIBFLAGS)
 #	@echo 'Finished building target: $@'
 	cp $(TARGET) $(DST)