diff options
| author | bustico | 2009-07-07 13:48:54 +0000 |
|---|---|---|
| committer | bustico | 2009-07-07 13:48:54 +0000 |
| commit | b0d3c9d6ee48525be1cc2d6ac09bc08cdc89d22f (patch) | |
| tree | 0573e40c9569a6c3a549b84aa2eeecd9ad21412a | |
| parent | 746a37f3e9cb95f99023deb040a5f65e8886a036 (diff) | |
| download | ivy-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
| -rw-r--r-- | src/Makefile.osx | 26 | ||||
| -rw-r--r-- | tools/Makefile.osx | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/Makefile.osx b/src/Makefile.osx index 35e65de..ff2a44c 100644 --- a/src/Makefile.osx +++ b/src/Makefile.osx @@ -22,17 +22,17 @@ else endif REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT) -OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o -OMPOBJ = ivyloop.o timer.o ivysocket_omp.o ivy_omp.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o +OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o +OMPOBJ = ivyloop.o timer.o ivysocket_omp.o ivy_omp.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o TOOLS_DIR = ../tools -# you should first install gcc version >= 4.3 +# you should first install gcc version >= 4.3 # gcc (g++) 4.3 is the first gcc version which support openmp under macosx -# using macport greatly simplify gcc install : port install gcc43 -OMPCC = gcc-mp-4.3 -OMPCPP = g++-mp-4.3 -OMPLIBTOOL =gar q +# using macport greatly simplify gcc install : port install gcc44 +OMPCC = gcc-mp-4.4 +OMPCPP = g++-mp-4.4 +OMPLIBTOOL =ar q OMPCFLAGS = -g -Wall $(FPIC) -fopenmp -DOPENMP=1 OMPLIB = -lgomp -lpthread @@ -40,12 +40,12 @@ OMPLIB = -lgomp -lpthread LIBTOOL=ar q # linux and solaris CFLAGS = -g -Wall $(FPIC) -CC=gcc -CPP=g++ -#CC = $(OMPCC) -#CPP = $(OMPCPP) -#LIBTOOL = $(OMPLIBTOOL) -#CFLAGS = $(OMPCFLAGS) +#CC=gcc +#CPP=g++ +CC = $(OMPCC) +CPP = $(OMPCPP) +LIBTOOL = $(OMPLIBTOOL) +CFLAGS = $(OMPCFLAGS) # ------------------------------------------------------------------------------------------ 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 $@ |