Changes for intel compiler

diff --git a/LHAPDF/liblhapdf.pkg b/LHAPDF/liblhapdf.pkg
index ee2a74c96c5ad692a89d5d7b238cca71af34f75b..52bfa42090d61e1dad975f645839dbc9e542e4e1 100644 (file)
--- a/LHAPDF/liblhapdf.pkg
+++ b/LHAPDF/liblhapdf.pkg
@@ -59,9 +59,13 @@ else
 ifeq (linuxicc,$(ALICE_TARGET))
 PACKFFLAGS = $(FFLAGS) -nofixed
 else
+ifeq (macosxicc,$(ALICE_TARGET))
+PACKFFLAGS = $(FFLAGS) -free
+else
 PACKFFLAGS = $(FFLAGS) -ffree-form
 endif
 endif
+endif
 PACKCXXFLAGS = $(CXXFLAGS) -DDEFAULTPREFIXPATH=\"NONE\" -DDEFAULTLHAPATH=\"../AliRoot/LHAPDF/PDFsets\"
 EXPORT:=AliStructFuncType.h
 

diff --git a/Makefile b/Makefile
index 33f27bbb2e5afe200d32363606b1641ff6293ecb..50d2aaba266eb3d3b3e17c069f49060ae7548275 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,9 @@ CXXFLAGSNO += $(GENINC) $(RCFLAGS) -Wno-write-strings
 CFLAGS     += $(GENINC) $(RCFLAGS)
 CINTFLAGS  += $(GENINC) $(RCFLAGS)
 FFLAGS    += $(RCFLAGS)
+ifeq (macosxicc,$(ALICE_TARGET))
+FFLAGS     := $(patsubst -pthread, -reentrancy threaded, $(FFLAGS))
+endif
 LDFLAGS    += $(RLFLAGS)
 SOFLAGS    += $(RLFLAGS)
 DEPINC     += $(GENINC)