--- trunk/uoms/src/config/make.def.template.bupc	2010/04/05 17:12:14	1
+++ trunk/uoms/src/config/make.def.template.bupc	2010/11/30 13:05:36	15
@@ -1,7 +1,7 @@
 # Makefile definitions
 
 # Compiler used to compile the C code
-CC = gcc
+CC = icc
 
 # Compiler flags used to compile the timing code
 CFLAGS = -O3
@@ -10,7 +10,7 @@
 UPCC = upcc
 
 # Compiler flags
-UPCFLAGS = -Wc,-O3 -pthreads -DBUPC_USE_UPC_NAMESPACE
+UPCFLAGS = -Wc,-O3 -nopthreads -DBUPC_USE_UPC_NAMESPACE
 
 # Switch used for define the number of threads (be aware of blanks after the switch)
 THREADS_SWITCH = -T 
@@ -19,4 +19,4 @@
 UPCLINK = $(UPCC)
 
 # Linker flags
-UPCLINKFLAGS = $(UPCFLAGS)
+UPCLINKFLAGS = -Wl,-O3 -nopthreads -lm