summaryrefslogtreecommitdiff
path: root/tools/Makefile.osx
diff options
context:
space:
mode:
authorbustico2009-07-07 13:48:54 +0000
committerbustico2009-07-07 13:48:54 +0000
commitb0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f (patch)
tree0573e40c9569a6c3a549b84aa2eeecd9ad21412a /tools/Makefile.osx
parent746a37f3e9cb95f99023deb040a5f65e8886a036 (diff)
downloadivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.zip
ivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.tar.gz
ivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.tar.bz2
ivy-c-b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f.tar.xz
fix openmp makefile to permit compilation with gcc-mp-43 or gcc-mp-44
Diffstat (limited to 'tools/Makefile.osx')
-rw-r--r--tools/Makefile.osx8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/Makefile.osx b/tools/Makefile.osx
index a45e4ff..ab4edb2 100644
--- a/tools/Makefile.osx
+++ b/tools/Makefile.osx
@@ -7,8 +7,8 @@ GLUTLIB = -L. -lglut -lGLU -lGL -lX11 -lXmu
TARGETS = ivyprobe ivythroughput ivyperf #ivyprobe_efence
OMP_TARGET= ivyprobe_omp ivythroughput_omp
OMPLIB = -lgomp -lpthread
-OMPCC = gcc-mp-4.3
-OMPCPP = g++-mp-4.3
+OMPCC = gcc-mp-4.4
+OMPCPP = g++-mp-4.4
CC = gcc -g -Wall
CPP='g++'
#CC = $(OMPCC)
@@ -42,10 +42,10 @@ ivyprobe_efence: ivyprobe.o ../src/libivy.a
ivyprobe_omp: ivyprobe.o ../src/libivy_omp.a
- $(OMPCC) $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivyprobe.o -L../src -livy_omp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
+ $(OMPCC) $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivyprobe.o -L../src -livy_omp $(PCRELIB) $(EXTRALIB) $(OMPLIB) -lgcc_s.1
ivythroughput_omp: ivythroughput.o ../src/libivy_omp.a
- $(OMPCPP) $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivythroughput.o -L../src -livy_omp -lpcrecpp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
+ $(OMPCPP) $(CFLAGS) $(EXTRAINC) $(PCREINCL) -o $@ ivythroughput.o -L../src -livy_omp -lpcrecpp $(PCRELIB) $(EXTRALIB) $(OMPLIB) -lgcc_s.1
ivyprobe.o : ivyprobe.c
$(CC) $(CFLAGS) $(EXTRAINC) $(REGEXP) -c ivyprobe.c -o $@