Merge pull request #8 from mgab/master

Modify Makefile so that it is compatible with GCC v5
SebastianRiedel · Oct 8, 2015 · 3614a40 · 3614a40
2 parents 1bab7cf + c9c61d4
commit 3614a40
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/c/Makefile b/c/Makefile
@@ -8,6 +8,8 @@ INSTALL_DIR=/usr
 CC=gcc
 CPP=g++
 NVCC=nvcc
+GCCVERSION := $(shell expr `$(CC) -dumpversion | cut -f1 -d.`)
+GCC5NEWER := $(shell expr `echo $(GCCVERSION)` \>= 5)
 #MEX=mex
 LINK=ar rcs
 CFLAGS=-Wall -I$(IDIR) -O3 -msse2
@@ -21,6 +23,9 @@ CUDAFLAGS=-O3 -lcuda -lcudart -lcurand -arch=compute_20
 #CYGWIN=1
 #WINDOWS=1
 
+ifeq "$(GCC5NEWER)" "1"
+CFLAGS += -fgnu89-inline
+endif
 
 ifdef WINDOWS
 CFLAGS += -static -mno-cygwin -I"C:\Program Files\GnuWin32\include" -DHAVE_WINDOWS #-mwindows -I/usr/include