Commit 79b048b4 authored by Ron Rahaman's avatar Ron Rahaman

Added OS-specific flags for Mac OS/X

parent a46c7e70
......@@ -17,6 +17,7 @@ MOAB_DIR=
F77=
CC=
P=
PC=
PPPO=
PPS=
G=
......@@ -138,10 +139,10 @@ FL2 = $(L2) $(P) $(PPS_F) -I$(CASEDIR) -I$S -I$(S2) -I$(OPT_INCDIR)
FL3 = $(L3) $(P) $(PPS_F) -I$(CASEDIR) -I$S -I$(OPT_INCDIR)
FL4 = $(L4) $(P) $(PPS_F) -I$(CASEDIR) -I$S -I$(OPT_INCDIR)
cFL0 = $(L0) $(PPS_C) -I$J
cFL2 = $(L2) $(PPS_C) -I$J
cFL3 = $(L3) $(PPS_C) -I$J
cFL4 = $(L4) $(PPS_C) -I$J
cFL0 = $(L0) $(PC) $(PPS_C) -I$J
cFL2 = $(L2) $(PC) $(PPS_C) -I$J
cFL3 = $(L3) $(PC) $(PPS_C) -I$J
cFL4 = $(L4) $(PC) $(PPS_C) -I$J
################################################################################
all : nek5000
......
......@@ -9,10 +9,10 @@ SOURCE_ROOT_JL="$SOURCE_ROOT/jl"
SOURCE_ROOT_CMT="$SOURCE_ROOT/core/cmt"
# Fortran compiler
F77="mpif77 -Wa,-q -Wl,-no_compact_unwind"
F77="mpif77"
# C compiler
CC="mpicc -Wl,-no_compact_unwind"
CC="mpicc"
# pre-processor symbol list
# (set PPLIST=? to get a list of available symbols)
......
......@@ -237,6 +237,13 @@ case $F77comp in
esac
export PPPO
# assign OS-specific flags
case $(uname) in
Darwin) P="-Wa,-q -Wl,-no_compact_unwind $P"
PC="-Wl,-no_compact_unwind $PC"
;;
esac
# set preprocessor symbols
if [ "$IFMPI" == "false" -o "$IFMPI" == "no" ]; then
IFMPI=false
......@@ -422,6 +429,7 @@ sed -e "s:^F77[ ]*=.*:F77\:=$F77:" \
-e "s:^G[ ]*=.*:G\:=$G:" \
-e "s:^OPT_FLAGS[ ]*=.*:OPT_FLAGS\:=$OPT_FLAGS:" \
-e "s/^P[ ]*=.*/P:=$P/" \
-e "s/^PC[ ]*=.*/PC:=$PC/" \
-e "s/^L0[ ]*=.*/L0=$L0/" \
-e "s/^L2[ ]*=.*/L2=$L2/" \
-e "s/^L3[ ]*=.*/L3=$L3/" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment