Separate flags from compiler variables 27/2827/13
authorAnirudh Manoj <anirudh@hpccharm.com>
Wed, 19 Jul 2017 22:00:12 +0000 (17:00 -0500)
committerEvan Ramos <evan@hpccharm.com>
Mon, 30 Oct 2017 17:48:08 +0000 (12:48 -0500)
Co-authored-by: Evan Ramos <evan@hpccharm.com>
Change-Id: Ibca079853dfa676f315b752d7669562ea072cb16

65 files changed:
src/arch/common/cc-bluegene.sh
src/arch/common/cc-clang.sh
src/arch/common/cc-gcc.sh
src/arch/common/cc-mpi.sh
src/arch/common/cc-mpiopts.sh
src/arch/common/conv-mach-darwin.sh
src/arch/common/conv-mach-g95.sh
src/arch/common/conv-mach-gfortran.sh
src/arch/common/conv-mach-papi.sh
src/arch/common/conv-mach-pedantic.h [moved from src/arch/net-linux-arm7/conv-mach-pedantic.h with 100% similarity]
src/arch/common/conv-mach-pedantic.sh [new file with mode: 0644]
src/arch/common/conv-mach-perftools.sh
src/arch/common/conv-mach-tsan.sh
src/arch/gni-crayxc/conv-mach.sh
src/arch/gni-crayxe/conv-mach.sh
src/arch/gni/conv-mach-papi.sh
src/arch/mpi-bluegeneq/conv-mach.sh
src/arch/mpi-crayxc/conv-mach.sh
src/arch/mpi-crayxe/conv-mach.sh
src/arch/mpi-darwin-x86_64/conv-mach.sh
src/arch/mpi-linux-mips64/conv-mach.sh
src/arch/mpi-linux-x86_64/conv-mach-scyld.sh
src/arch/mpi-linux-x86_64/conv-mach.sh
src/arch/mpi-linux/conv-mach-scyld.sh
src/arch/mpi-win64/conv-mach.sh
src/arch/multicore-arm7/conv-mach.sh
src/arch/multicore-darwin-x86_64/conv-mach.sh
src/arch/multicore-linux32/conv-mach.sh
src/arch/multicore-linux64/conv-mach.sh
src/arch/multicore-win64/conv-mach.sh
src/arch/net-darwin-x86_64/conv-mach-smp.sh
src/arch/net-linux-arm7/conv-mach-pedantic.sh [deleted file]
src/arch/net-linux-arm7/conv-mach.sh
src/arch/net-linux-ppc/conv-mach.sh
src/arch/net-linux-x86_64/conv-mach-pedantic.h [deleted file]
src/arch/net-linux-x86_64/conv-mach-pedantic.sh [deleted file]
src/arch/net-linux-x86_64/conv-mach.sh
src/arch/net-linux/conv-mach-scyld.sh
src/arch/net-linux/conv-mach.sh
src/arch/net/conv-mach-tcp.sh
src/arch/netlrts-darwin-x86_64/conv-mach-smp.sh
src/arch/netlrts-linux-arm7/conv-mach-pedantic.h [deleted file]
src/arch/netlrts-linux-arm7/conv-mach-pedantic.sh [deleted file]
src/arch/netlrts-linux-arm7/conv-mach.sh
src/arch/netlrts-linux-ppc/conv-mach.sh
src/arch/netlrts-linux-x86_64/conv-mach-pedantic.h [deleted file]
src/arch/netlrts-linux-x86_64/conv-mach-pedantic.sh [deleted file]
src/arch/netlrts-linux-x86_64/conv-mach.sh
src/arch/netlrts-linux/conv-mach-scyld.sh
src/arch/netlrts-linux/conv-mach.sh
src/arch/netlrts-win-x86_64/conv-mach.sh
src/arch/pami-bluegeneq/conv-mach.sh
src/arch/pami-linux-ppc64le/conv-mach.sh
src/arch/pamilrts-bluegeneq/conv-mach.sh
src/arch/shmem-crayxe/conv-mach.sh
src/arch/template/conv-mach.sh
src/arch/uth-linux-x86_64/conv-mach.sh
src/arch/uth-linux/conv-mach.sh
src/arch/verbs-linux-ppc64le/conv-mach.sh
src/arch/verbs-linux-x86_64/conv-mach-pedantic.h [deleted file]
src/arch/verbs-linux-x86_64/conv-mach-pedantic.sh [deleted file]
src/arch/verbs-linux-x86_64/conv-mach.sh
src/scripts/charmc
src/scripts/configure.ac
src/scripts/conv-config.sh

index af9f9bc2a4c3ce07a75886b31fb95757c7752830..6fb1135aad459f8e188db7ed03de756b07553d45 100644 (file)
@@ -20,7 +20,9 @@ OPTS_CPP="$OPTS_CPP"
 OPTS_LD="$OPTS_LD"
 
 CMK_CPP_CHARM="$BGQ_BIN/powerpc64-bgq-linux-cpp -P"
-CMK_CPP_C="$BGQ_BIN/powerpc64-bgq-linux-cpp -E "
+CMK_CPP_C="$BGQ_BIN/powerpc64-bgq-linux-cpp "
+
+CMK_CPP_C_FLAGS="-E"
 
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
 
index 5ab6b4769ea9b1343cfcf9c223919d2ee0d0ab8b..e228a4978d46d9ce4cb5bf910e2f871248db310c 100644 (file)
@@ -1,10 +1,17 @@
 # Assumes Clang C/C++ compiler:
 CMK_CPP_CHARM="cpp -P"
-CMK_CPP_C="clang -E"
-CMK_CC="clang -Wno-deprecated-declarations"
+CMK_CPP_C="clang"
+CMK_CC="clang"
 CMK_LD="clang"
-CMK_CXX="clang++ -Wno-deprecated-declarations"
+CMK_CXX="clang++"
 CMK_LDXX="clang++"
 
+CMK_CPP_C_FLAGS="-E"
+
+if [ -z "$CMK_MACOSX" ]; then
+    CMK_CC_FLAGS="-Wno-deprecated-declarations"
+    CMK_CXX_FLAGS="-Wno-deprecated-declarations"
+fi
+
 CMK_USING_CLANG="1"
 CMK_WARNINGS_ARE_ERRORS="-Werror"
index 0529173ca1546d4b43eeae8e624df3caefa1dc05..31fa6f8e6106118ffecf41e7dec84dc78136610c 100644 (file)
@@ -1,10 +1,12 @@
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C='gcc -E'
+CMK_CPP_C='gcc'
 CMK_CC='gcc'
 CMK_CXX='g++'
 CMK_LD='gcc'
 CMK_LDXX='g++'
 
+CMK_CPP_C_FLAGS="-E"
+
 CMK_LD_SHARED='-shared'
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
 CMK_RANLIB='ranlib'
@@ -18,11 +20,16 @@ if [ "$CMK_MACOSX" ]; then
     $cand -v 2>&1 | grep -q clang
     if [ $? -eq 1 ]; then
       cppcand=$(echo $cand | sed s,cc,++,)
-      CMK_CPP_C="$cand -E "
-      CMK_CC="$cand -fPIC "
+      CMK_CPP_C="$cand"
+      CMK_CC="$cand "
       CMK_LD="$cand "
-      CMK_CXX="$cppcand -fPIC -Wno-deprecated "
+      CMK_CXX="$cppcand "
       CMK_LDXX="$cppcand "
+
+      CMK_CC_FLAGS="-fPIC"
+      CMK_CXX_FLAGS="-fPIC -Wno-deprecated"
+      CMK_LD_FLAGS="-fPIC -Wl,-no_pie "
+      CMK_LDXX_FLAGS="-fPIC -multiply_defined suppress -Wl,-no_pie"
       found=1
       break
     fi
index 29d480f045e548ea1c1a23c052e1236b5d8b2bbb..d7b80ab3742d9a5fb7e6c4ec7dea40896eac5d5d 100644 (file)
@@ -1,7 +1,10 @@
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C='mpicc -E'
+CMK_CPP_C='mpicc'
 CMK_CC='mpicc '
 CMK_CXX='mpicxx '
+
+CMK_CPP_C_FLAGS="-E"
+
 CMK_RANLIB='ranlib'
 CMK_LIBS='-lckqt'
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
index 132df4f76a5c608e1139b2dba7d6372d488087a8..df4cbc7f8e931f80db00f8ed63436a2745995885 100644 (file)
@@ -21,7 +21,9 @@ fi
 CMK_REAL_COMPILER=`$MPICXX -show 2>/dev/null | cut -d' ' -f1 `
 
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C="$MPICC -E"
+CMK_CPP_C="$MPICC"
+
+CMK_CPP_C_FLAGS="-E"
 
 CMK_LIBS="-lckqt $CMK_SYSLIBS "
 CMK_QT='generic64-light'
index db95b3e3a985483be2cbd577e3a26c096788fa7c..c6887f34d2851527a3bf234cbfb37dec1409b575 100644 (file)
@@ -5,11 +5,10 @@ CMK_LIBS='-lckqt'
 CMK_QT='generic64-light'
 CMK_XIOPTS=''
 
-CMK_CPP_C="$CMK_CPP_C -fPIC "
-CMK_CC="$CMK_CC -dynamic -fno-common "
-CMK_LD="$CMK_LD -Wl,-no_pie "
-CMK_CXX="$CMK_CXX -fPIC -dynamic -fno-common -stdlib=libc++ "
-CMK_LDXX="$CMK_LDXX -multiply_defined suppress -Wl,-no_pie -stdlib=libc++ "
+CMK_CC_FLAGS="$CMK_CC_FLAGS -fPIC -dynamic -fno-common "
+CMK_LD_FLAGS="$CMK_LD_FLAGS -Wl,-no_pie "
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -fPIC -dynamic -fno-common -stdlib=libc++ "
+CMK_LDXX_FLAGS="$CMK_LDXX_FLAGS -multiply_defined suppress -Wl,-no_pie -stdlib=libc++ "
 
 # setting for shared lib
 # need -lc++ for c++ reference, and it needs to be put at very last
index 8e20bf3bfc7a323c628a35cbe1baecbd5a9083ef..3393651bc0dc86528db5eacde16d1ae2b0a82bb9 100644 (file)
@@ -1,5 +1,5 @@
-CMK_CC="$CMK_CC -DCMK_G95"
-CMK_CXX="$CMK_CXX -DCMK_G95"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_G95"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_G95"
 
 if test -n "$CMK_MACOSX"
 then
index 0c7b42a62e4b1d3358378c76e492c1dca59ea28f..65421afa6861f4bed672f8532d6f34a9bf3c6ccc 100644 (file)
@@ -1,5 +1,5 @@
-CMK_CC="$CMK_CC -DCMK_GFORTRAN"
-CMK_CXX="$CMK_CXX -DCMK_GFORTRAN"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_GFORTRAN"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_GFORTRAN"
 
 if test -n "$CMK_MACOSX"
 then
index 217684dfd92fbd19cf5d29c97d53f02ec252a92b..739700c2f5384d0cf777d674c45364f146bfc2eb 100644 (file)
@@ -15,8 +15,8 @@ then
       PAPI_LIBDIR="/usr/apps/tools/papi/lib"
     fi
     CMK_LIBDIR="-L$PAPI_LIBDIR"
-    CMK_LD="$CMK_LD -Wl,-rpath,$PAPI_LIBDIR"
-    CMK_LDXX="$CMK_LDXX -Wl,-rpath,$PAPI_LIBDIR"
+    CMK_LD_FLAGS="$CMK_LD_FLAGS -Wl,-rpath,$PAPI_LIBDIR"
+    CMK_LDXX_FLAGS="$CMK_LDXX_FLAGS -Wl,-rpath,$PAPI_LIBDIR"
   fi
 fi
 
@@ -27,7 +27,7 @@ then
   PAPI_INCDIR="$HOME/papi/include"
   CMK_INCDIR="$CMK_INCDIR -I$PAPI_INCDIR"
   CMK_LIBDIR="-L$PAPI_LIBDIR"
-  CMK_LD="$CMK_LD -Wl,-rpath,$PAPI_LIBDIR"
-  CMK_LDXX="$CMK_LDXX -Wl,-rpath,$PAPI_LIBDIR" 
+  CMK_LD_FLAGS="$CMK_LD_FLAGS -Wl,-rpath,$PAPI_LIBDIR"
+  CMK_LDXX_FLAGS="$CMK_LDXX_FLAGS -Wl,-rpath,$PAPI_LIBDIR"
   CMK_LIBS="$CMK_LIBS -lpapi"
 fi
diff --git a/src/arch/common/conv-mach-pedantic.sh b/src/arch/common/conv-mach-pedantic.sh
new file mode 100644 (file)
index 0000000..dc0a7e2
--- /dev/null
@@ -0,0 +1 @@
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -pedantic -Wno-long-long"
index 06952d466cf64f21096b28228cd59cfcb76e0fc7..3b31578fe7291f6f1c9af27914c9fd24fb2e6df6 100644 (file)
@@ -31,5 +31,5 @@ fi
 CMK_SEQ_CC="$CMK_SEQ_CC -fPIC"
 CMK_SEQ_CXX="$CMK_SEQ_CXX -fPIC"
 
-CMK_CC="$CMK_CC $CRAYPAT_FLAGS"
-CMK_CXX="$CMK_CXX $CRAYPAT_FLAGS"
+CMK_CC_FLAGS="$CMK_CC_FLAGS $CRAYPAT_FLAGS"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS $CRAYPAT_FLAGS"
index 15d92199137a075612ca8cb56a6bb60869a86024..c4f8be17c29f68eb2a8b4eaa2455335244af8516 100644 (file)
@@ -1,4 +1,4 @@
-CMK_CC="$CMK_CC -fsanitize=thread -fPIC"
-CMK_CXX="$CMK_CXX -fsanitize=thread -fPIC"
-CMK_LD="$CMK_LD -fsanitize=thread -pie"
-CMK_LDXX="$CMK_LDXX -fsanitize=thread -pie"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -fsanitize=thread -fPIC"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -fsanitize=thread -fPIC"
+CMK_LD_FLAGS="$CMK_LD_FLAGS -fsanitize=thread -pie"
+CMK_LDXX_FLAGS="$CMK_LDXX_FLAGS -fsanitize=thread -pie"
index 88a30dc4d57d2b9c8badcedf7b2164e22bbb7c81..1b16bc0fdba97845dc2fa96580e164cf08370a5d 100644 (file)
@@ -39,10 +39,13 @@ GNU=`CC -V 2>&1 | grep 'g++'`
 CCE=`CC -V 2>&1 | grep 'Cray'`
 
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C="cc -E"
+CMK_CPP_C="cc"
 CMK_CC="cc "
 CMK_CXX="CC "
 CMK_LD="eval $CMK_CC "
+
+CMK_CPP_C_FLAGS="-E"
+
 CMK_LIBS='-lckqt'
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/,$PMI_LIBS "
 
@@ -52,8 +55,8 @@ CMK_QT="generic64-light"
 # compiler for compiling sequential programs
 if test -n "$PGCC"
 then
-CMK_CC="$CMK_CC -DCMK_FIND_FIRST_OF_PREDICATE=1 "
-CMK_CXX="$CMK_CXX -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 "
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
 # gcc is needed for building QT
 CMK_SEQ_CC="gcc "
 CMK_SEQ_CXX="pgCC  --no_using_std "
index 8d06f40bf1ef8e1e60c7ce2e2cc50b850e9647c4..9ecc718f0c3e4a8d7075cfec20ee763ea7c296f4 100644 (file)
@@ -8,10 +8,13 @@ GNU=`CC -V 2>&1 | grep 'g++'`
 CCE=`CC -V 2>&1 | grep 'Cray'`
 
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C="cc -E"
+CMK_CPP_C="cc"
 CMK_CC="cc "
 CMK_CXX="CC "
 CMK_LD="eval $CMK_CC "
+
+CMK_CPP_C_FLAGS="-E"
+
 CMK_LIBS='-lckqt'
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/,$PMI_LIBS "
 
@@ -20,8 +23,8 @@ CMK_QT="generic64-light"
 # compiler for compiling sequential programs
 if test -n "$PGCC"
 then
-CMK_CC="$CMK_CC -DCMK_FIND_FIRST_OF_PREDICATE=1 "
-CMK_CXX="$CMK_CXX -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 "
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
 # gcc is needed for building QT
 CMK_SEQ_CC="gcc "
 CMK_SEQ_CXX="pgCC  --no_using_std "
index 6a7417b501e53730fd7fbdeceac49a71aa2e0d2a..72dae27ff29319d6c591ed9f160faad2472e71ac 100644 (file)
@@ -11,5 +11,5 @@ PAPI_INCDIR=`pkg-config --cflags papi`
 PAPI_LIBDIR=`pkg-config --libs papi`
 CMK_INCDIR="$CMK_INCDIR $PAPI_INCDIR"
 CMK_LIBDIR="$CMK_LIBDIR $PAPI_LIBDIR"
-CMK_LD="$CMK_LD -Wl,-rpath,$PAPI_LIBDIR"
-CMK_LDXX="$CMK_LDXX -Wl,-rpath,$PAPI_LIBDIR"
+CMK_LD_FLAGS="$CMK_LD_FLAGS -Wl,-rpath,$PAPI_LIBDIR"
+CMK_LDXX_FLAGS="$CMK_LDXX_FLAGS -Wl,-rpath,$PAPI_LIBDIR"
index c22bd6487300c0fbb59482966e44016d2d0f8a92..50ab7e15feaaa0b4c80af2db0dc966de4d23dac8 100644 (file)
@@ -24,13 +24,18 @@ fi
 
 GCC_OPTS="$GCC_OPTS -mminimal-toc $BGQ_INC"
 
-CMK_CXX="mpixlcxx_r -qhalt=e $BGQ_INC -qnokeyword=__int128 -qtls=local-exec -DCMK_USING_XLC=1"
-CMK_CC="mpixlc_r -qcpluscmt -qhalt=e $BGQ_INC -qnokeyword=__int128 -qtls=local-exec"
+CMK_CXX="mpixlcxx_r"
+CMK_CC="mpixlc_r"
 CMK_GCXX="mpicxx $GCC_OPTS "
 
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
 
+CMK_CC_FLAGS="-qcpluscmt -qhalt=e $BGQ_INC -qnokeyword=__int128 -qtls=local-exec"
+CMK_CXX_FLAGS="-qhalt=e $BGQ_INC -qnokeyword=__int128 -qtls=local-exec -DCMK_USING_XLC=1"
+CMK_LD_FLAGS="$CMK_CC_FLAGS"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS"
+
 CMK_CF77="mpixlf77_r "
 CMK_CF90="mpixlf90_r  -qsuffix=f=f90"
 CMK_CF90_FIXED="mpixlf90_r "
index 48faa1b9a005321c2f16334cbdd420662a9c6d3d..90c8f51eebd895aa627be568aff128eb270a5924 100644 (file)
@@ -39,19 +39,22 @@ GNU=`CC -V 2>&1 | grep 'g++'`
 CCE=`CC -V 2>&1 | grep 'Cray'`
 
 CMK_CPP_CHARM="cpp -P"
-CMK_CPP_C="cc -E"
+CMK_CPP_C="cc"
 CMK_CC="cc "
 CMK_CXX="CC "
 CMK_LD="$CMK_CC "
 CMK_LDXX="$CMK_CXX "
+
+CMK_CPP_C_FLAGS="-E"
+
 CMK_LIBS='-lckqt'
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/,$PMI_LIBS "
 
 # compiler for compiling sequential programs
 if test -n "$PGCC"
 then
-CMK_CC="$CMK_CC -DCMK_FIND_FIRST_OF_PREDICATE=1 "
-CMK_CXX="$CMK_CXX -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 "
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
 # gcc is needed for building QT
 CMK_SEQ_CC="gcc -fPIC "
 CMK_SEQ_CXX="pgCC -fPIC --no_using_std "
index d7373d9eaf1b68fdc779534fc8d4ee845cc8a383..ce336236b3bdf9d1d0edc137cc99041f77f9f281 100644 (file)
@@ -8,11 +8,14 @@ GNU=`CC -V 2>&1 | grep 'g++'`
 CCE=`CC -V 2>&1 | grep 'Cray'`
 
 CMK_CPP_CHARM="cpp -P"
-CMK_CPP_C="cc -E "
+CMK_CPP_C="cc "
 CMK_CC="cc "
 CMK_CXX="CC "
 CMK_LD="$CMK_CC "
 CMK_LDXX="$CMK_CXX "
+
+CMK_CPP_C_FLAGS="-E"
+
 # Swap these and set XT[45]_TOPOLOGY in conv-mach.h if doing topo work
 # on a Cray XT of known dimensions. See src/util/CrayNid.c for details
 #CMK_LIBS="-lckqt -lrca"
@@ -23,8 +26,8 @@ CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/,$PMI_LIBS "
 # compiler for compiling sequential programs
 if test -n "$PGCC"
 then
-CMK_CC="$CMK_CC -DCMK_FIND_FIRST_OF_PREDICATE=1 "
-CMK_CXX="$CMK_CXX -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 "
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
 # gcc is needed for building QT
 CMK_SEQ_CC="gcc -fPIC "
 CMK_SEQ_CXX="pgCC -fPIC --no_using_std "
index 97fa7b0923aa9127a1d945eb2824e8a31832bb61..415d2682e8376c8bd7003c720111cb03e4ef0ea0 100644 (file)
@@ -4,9 +4,12 @@ CMK_MACOSX=1
 
 CMK_AMD64="-dynamic -fPIC -fno-common -mmacosx-version-min=10.7 -Wno-deprecated-declarations"
 
-CMK_CPP_C="$CMK_CPP_C -mmacosx-version-min=10.7"
-CMK_CC="$MPICC $CMK_AMD64 "
-CMK_CXX="$MPICXX $CMK_AMD64 "
+CMK_CC="$MPICC "
+CMK_CXX="$MPICXX "
+
+CMK_CPP_C_FLAGS="$CMK_CPP_C_FLAGS -mmacosx-version-min=10.7"
+CMK_CC_FLAGS="$CMK_CC_FLAGS $CMK_AMD64"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS $CMK_AMD64"
 
 CMK_XIOPTS=""
 
index adf1fe968ccc70ad54b053768e27da3e78be84b8..491cb9afd85da1edbd05c96f101f5944d7cc3d11 100644 (file)
@@ -3,9 +3,10 @@
 CMK_INCDIR='/sicortex/software/gentoo/buildroot/default/usr/include'
 CMK_LIBDIR='-L/sicortex/software/gentoo/buildroot/default/lib64 -L/sicortex/software/gentoo/buildroot/default/usr/lib64'
 
-CMK_CPP_C="$CMK_CPP_C -G0 "
-CMK_CC="$CMK_CC -G0 -mips64 -march=5kf -mtune=5kf "
-CMK_CXX="$CMK_CXX -G0 -mips64 -march=5kf -mtune=5kf "
+CMK_CPP_C_FLAGS="$CMK_CPP_C_FLAGS -G0"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -G0 -mips64 -march=5kf -mtune=5kf"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -G0 -mips64 -march=5kf -mtune=5kf"
+
 CMK_LIBS="$CMK_LIBS -lscdma -lpmi "
 #CMK_QT="i386-gcc"
 
index 9cd0f843e4f027da0e187bc2d012e6e89e3d4edc..7b373bce167d0e710546f5436a3a88c25092fd27 100644 (file)
@@ -1,25 +1,31 @@
 
 case "$CMK_CC" in
 mpicc*)
-       CMK_CPP_C="gcc -E "
-       CMK_CC="gcc -fPIC"
+       CMK_CPP_C="gcc "
+       CMK_CC="gcc"
        CMK_CC_RELIABLE="gcc  -fPIC"
        CMK_CC_FASTEST="gcc  -fPIC"
-       CMK_CXX="g++ -fPIC"
+       CMK_CXX="g++"
        CMK_LD="gcc"
        CMK_LDXX="g++"
 
+       CMK_CPP_C_FLAGS="-E"
+       CMK_CC_FLAGS="-fPIC"
+       CMK_CXX_FLAGS="-fPIC"
+       CMK_LD_FLAGS=""
+       CMK_LDXX_FLAGS=""
+
 # native compiler for compiling charmxi, etc
-       CMK_NATIVE_CC="$CMK_CC"
-       CMK_NATIVE_CXX="$CMK_CXX"
-       CMK_NATIVE_LD="$CMK_CC"
-       CMK_NATIVE_LDXX="$CMK_CXX"
+       CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS"
+       CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+       CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS"
+       CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS"
 
 # native compiler for compiling charmxi, etc
-       CMK_SEQ_CC="$CMK_CC"
-       CMK_SEQ_CXX="$CMK_CXX"
-       CMK_SEQ_LD="$CMK_CC"
-       CMK_SEQ_LDXX="$CMK_CXX"
+       CMK_SEQ_CC="$CMK_CC $CMK_CC_FLAGS"
+       CMK_SEQ_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+       CMK_SEQ_LD="$CMK_CC $CMK_CC_FLAGS"
+       CMK_SEQ_LDXX="$CMK_CXX $CMK_CXX_FLAGS"
        ;;
 esac
 CMK_LIBS="$CMK_LIBS -lmpi"
index 38db6f25174e48b30c0b08be5e0cb1793bbb17ea..054c1a07b3e811b5ab35ec0310825512903cff23 100644 (file)
@@ -8,8 +8,11 @@ pgCC)  CMK_AMD64_CC='-fPIC'; CMK_AMD64_CXX='-fPIC -DCMK_FIND_FIRST_OF_PREDICATE=
 charmc)  echo "Error> charmc can not call AMPI's mpicxx/mpiCC wrapper! Please fix your PATH."; exit 1 ;;
 esac
 
-CMK_CC="$MPICC $CMK_AMD64_CC "
-CMK_CXX="$MPICXX $CMK_AMD64_CXX "
+CMK_CC="$MPICC "
+CMK_CXX="$MPICXX "
+
+CMK_CC_FLAGS="$CMK_CC_FLAGS $CMK_AMD64_CC"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS $CMK_AMD64_CXX"
 
 #CMK_SYSLIBS="-lmpich"
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
index 9cd0f843e4f027da0e187bc2d012e6e89e3d4edc..7b373bce167d0e710546f5436a3a88c25092fd27 100644 (file)
@@ -1,25 +1,31 @@
 
 case "$CMK_CC" in
 mpicc*)
-       CMK_CPP_C="gcc -E "
-       CMK_CC="gcc -fPIC"
+       CMK_CPP_C="gcc "
+       CMK_CC="gcc"
        CMK_CC_RELIABLE="gcc  -fPIC"
        CMK_CC_FASTEST="gcc  -fPIC"
-       CMK_CXX="g++ -fPIC"
+       CMK_CXX="g++"
        CMK_LD="gcc"
        CMK_LDXX="g++"
 
+       CMK_CPP_C_FLAGS="-E"
+       CMK_CC_FLAGS="-fPIC"
+       CMK_CXX_FLAGS="-fPIC"
+       CMK_LD_FLAGS=""
+       CMK_LDXX_FLAGS=""
+
 # native compiler for compiling charmxi, etc
-       CMK_NATIVE_CC="$CMK_CC"
-       CMK_NATIVE_CXX="$CMK_CXX"
-       CMK_NATIVE_LD="$CMK_CC"
-       CMK_NATIVE_LDXX="$CMK_CXX"
+       CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS"
+       CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+       CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS"
+       CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS"
 
 # native compiler for compiling charmxi, etc
-       CMK_SEQ_CC="$CMK_CC"
-       CMK_SEQ_CXX="$CMK_CXX"
-       CMK_SEQ_LD="$CMK_CC"
-       CMK_SEQ_LDXX="$CMK_CXX"
+       CMK_SEQ_CC="$CMK_CC $CMK_CC_FLAGS"
+       CMK_SEQ_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+       CMK_SEQ_LD="$CMK_CC $CMK_CC_FLAGS"
+       CMK_SEQ_LDXX="$CMK_CXX $CMK_CXX_FLAGS"
        ;;
 esac
 CMK_LIBS="$CMK_LIBS -lmpi"
index 294a640e0f545cc18e13b50b096630f5a07d974e..2f5af74273c102d19b19bb00b18705e4198b2109 100644 (file)
@@ -7,22 +7,30 @@ else
 fi
 HPC_SDK=`cygpath -d "$HPC_SDK"`
 
-CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE -I `cygpath -u "$HPC_SDK\Inc"` -I `cygpath -u "$HPC_SDK\Include"`"
+CMK_CC="$CHARMBIN/unix2nt_cc"
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE  -I `cygpath -u "$HPC_SDK\Inc"` -I `cygpath -u "$HPC_SDK\Include"`"
-CMK_LD="$CMK_CC -L `cygpath -u "$HPC_SDK\Lib\amd64"` -lmsmpi"
-CMK_LDXX="$CMK_CXX -L `cygpath -u "$HPC_SDK\Lib\amd64"` -lmsmpi"
+CMK_CPP_C="$CMK_CC"
+CMK_CXX="$CHARMBIN/unix2nt_cc"
+CMK_LD="$CMK_CC"
+CMK_LDXX="$CMK_CXX"
+
+CMK_CC_FLAGS="-D_CRT_SECURE_NO_DEPRECATE -I `cygpath -u "$HPC_SDK\Inc"` -I `cygpath -u "$HPC_SDK\Include"`"
+CMK_CPP_C_FLAGS="$CMK_CC_FLAGS -E"
+CMK_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE  -I `cygpath -u "$HPC_SDK\Inc"` -I `cygpath -u "$HPC_SDK\Include"`"
+CMK_LD_FLAGS="$CMK_CC_FLAGS -L `cygpath -u "$HPC_SDK\Lib\amd64"` -lmsmpi"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS -L `cygpath -u "$HPC_SDK\Lib\amd64"` -lmsmpi"
 
 if test "$NO_WIN_HPC_HEADERS_FOR_AMPI" = "1" ; then
-       CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
-       CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+       CMK_CC="$CHARMBIN/unix2nt_cc"
+       CMK_CXX="$CHARMBIN/unix2nt_cc"
+       CMK_CC_FLAGS="-D_CRT_SECURE_NO_DEPRECATE"
+       CMK_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE"
 fi
 
-CMK_SEQ_CC="$CMK_CC"
-CMK_SEQ_CXX="$CMK_CXX"
-CMK_SEQ_LD="$CMK_LD"
-CMK_SEQ_LDXX="$CMK_LDXX"
+CMK_SEQ_CC="$CMK_CC $CMK_CC_FLAGS"
+CMK_SEQ_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+CMK_SEQ_LD="$CMK_LD $CMK_LD_FLAGS"
+CMK_SEQ_LDXX="$CMK_LDXX $CMK_LDXX_FLAGS"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
index 398067069568590a9ac8d4eae94f111e875ceb0e..e059f85328d1e65218de4089b21ba988922d770f 100644 (file)
@@ -9,10 +9,10 @@ CMK_WARNINGS_ARE_ERRORS="-Werror"
 CMK_CXX_OPTIMIZE="-O3"
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index 2e6f3990dac3eac9822ba86486b43e3079f6bd62..21ea830a0a3e7b0e50b22993e2fba014824c7962 100644 (file)
@@ -1,6 +1,6 @@
 . $CHARMINC/cc-clang.sh
 . $CHARMINC/conv-mach-darwin.sh
 
-CMK_DEFS="$CMK_DEFS -D_REENTRANT -arch x86_64"
+CMK_DEFS="$CMK_DEFS -D_REENTRANT"
 
 CMK_SMP="1"
index e852e01abc35a203dc10e6ba72c10dc325c422e6..3e03aea46353d03270ab686905d5b0cc4238fd1e 100644 (file)
@@ -6,10 +6,10 @@ CMK_XIOPTS=''
 CMK_LIBS="-lpthread $CMK_LIBS"
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_LDXX="$CMK_CXX $CMK_DEFS "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index e555f42868bc4307a1bf37e1ad1db29df443439c..2f85f13a90bd33ec06b9c82fd0cdc81994a2da70 100644 (file)
@@ -6,10 +6,10 @@ CMK_XIOPTS=''
 CMK_LIBS="-lpthread $CMK_LIBS"
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_LDXX="$CMK_CXX $CMK_DEFS "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index 9cf1a2475d8c7455fb9b0ce777464bf3d6a8fcf3..3971f5f8203bd41510fb27167622fc26e3d694f0 100644 (file)
@@ -1,14 +1,20 @@
-CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CC="$CHARMBIN/unix2nt_cc "
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CPP_C="$CMK_CC -E"
-CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CPP_C="$CMK_CC"
+CMK_CXX="$CHARMBIN/unix2nt_cc "
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
 
-CMK_SEQ_CC="$CMK_CC"
-CMK_SEQ_CXX="$CMK_CXX"
-CMK_SEQ_LD="$CMK_LD"
-CMK_SEQ_LDXX="$CMK_LDXX"
+CMK_CC_FLAGS="-D_CRT_SECURE_NO_DEPRECATE"
+CMK_CPP_C_FLAGS="$CMK_CC_FLAGS -E"
+CMK_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE"
+CMK_LD_FLAGS="$CMK_CC_FLAGS"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS"
+
+CMK_SEQ_CC="$CMK_CC $CMK_CC_FLAGS"
+CMK_SEQ_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+CMK_SEQ_LD="$CMK_LD $CMK_LD_FLAGS"
+CMK_SEQ_LDXX="$CMK_LDXX $CMK_LDXX_FLAGS"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
index faf91234422429035c9f19452433d986d653dc7c..ad6551b003527170e578438d0dfe77cf516003d1 100644 (file)
@@ -1,4 +1,4 @@
-CMK_DEFS=' -D_REENTRANT '
+CMK_DEFS="$CMK_DEFS -D_REENTRANT "
 CMK_LIBS="-lpthread $CMK_LIBS "
 CMK_QT='generic64-light'
 CMK_SMP="1"
diff --git a/src/arch/net-linux-arm7/conv-mach-pedantic.sh b/src/arch/net-linux-arm7/conv-mach-pedantic.sh
deleted file mode 100644 (file)
index 033b6c3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-CMK_CC="$CMK_CC"
-CMK_CXX="$CMK_CXX -pedantic -Wno-long-long"
index 4547ccd4644a5244219ae1f2462cb27cb8e9c47f..4b9db447b765fc706d28b621a80810a7ba8a2d6a 100644 (file)
@@ -7,10 +7,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index f957edda748343a4faa35e355769d284e83ff2d1..66cb8834a8d2555ed8f6cdc23c53e46f4b389478 100644 (file)
@@ -2,12 +2,14 @@
 
 isLinux=true
 
-CMK_CC="$CMK_CC -m32"
-CMK_CXX="$CMK_CXX -m32"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -m32"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -m32"
 #CMK_LD="$CMK_CC -Wl,--allow-multiple-definition "
 #CMK_LDXX="$CMK_CXX -Wl,--allow-multiple-definition "
-CMK_LD="$CMK_CC -m32"
-CMK_LDXX="$CMK_CXX -m32"
+CMK_LD="$CMK_CC "
+CMK_LDXX="$CMK_CXX "
+CMK_LD_FLAGS="$CMK_CC_FLAGS -m32"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS -m32"
 CMK_XIOPTS=''
 CMK_QT='generic64-light'
 
diff --git a/src/arch/net-linux-x86_64/conv-mach-pedantic.h b/src/arch/net-linux-x86_64/conv-mach-pedantic.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/net-linux-x86_64/conv-mach-pedantic.sh b/src/arch/net-linux-x86_64/conv-mach-pedantic.sh
deleted file mode 100644 (file)
index 033b6c3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-CMK_CC="$CMK_CC"
-CMK_CXX="$CMK_CXX -pedantic -Wno-long-long"
index 4c2b1462e22463ed6e8f8bc0ad6390f58e44438a..7e54045ac97190c184ecda236a7236259c68785f 100644 (file)
@@ -6,10 +6,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index 1a2d25ef204bd0745a4a114670782e8040678e6a..eaded2c5d68488336f41cffb1cb41d1bf1155dfa 100644 (file)
@@ -1,6 +1,3 @@
-# -static to avoid missing dynamic libs
-CMK_LD="$CMK_LD "
-CMK_LDXX="$CMK_LDXX "
 CMK_LIBS="$CMK_LIBS -lbproc"
 CMK_NATIVE_LIBS="$CMK_NATIVE_LIBS -lbproc"
 CMK_BPROC=true
index 8a3c21826a50aaa98418a2fa4abdd259a44998f5..0bae00f555bf6f80fdadf1efe5b56d48efe70b05 100644 (file)
@@ -1,12 +1,15 @@
 . $CHARMINC/cc-gcc.sh
 
-CMK_CPP_C="$CMK_CPP_C -m32"
-CMK_CC="$CMK_CC -m32"
-CMK_CXX="$CMK_CXX -m32"
+CMK_CPP_C_FLAGS="$CMK_CPP_C_FLAGS -m32"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -m32"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -m32"
 #CMK_LD="$CMK_CC -Wl,--allow-multiple-definition "
 #CMK_LDXX="$CMK_CXX -Wl,--allow-multiple-definition "
 CMK_LD="$CMK_CC "
 CMK_LDXX="$CMK_CXX "
+CMK_LD_FLAGS="$CMK_CC_FLAGS "
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS "
+
 CMK_XIOPTS=''
 CMK_QT='i386-gcc'
 
index d94ebaeef9c66fb5b3af47fa4ae9708e01c7feed..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,4 +0,0 @@
-CMK_CC="$CMK_CC "
-CMK_CXX="$CMK_CXX "
-CMK_LD="$CMK_LD "
-CMK_LDXX="$CMK_LDXX "
index faf91234422429035c9f19452433d986d653dc7c..ad6551b003527170e578438d0dfe77cf516003d1 100644 (file)
@@ -1,4 +1,4 @@
-CMK_DEFS=' -D_REENTRANT '
+CMK_DEFS="$CMK_DEFS -D_REENTRANT "
 CMK_LIBS="-lpthread $CMK_LIBS "
 CMK_QT='generic64-light'
 CMK_SMP="1"
diff --git a/src/arch/netlrts-linux-arm7/conv-mach-pedantic.h b/src/arch/netlrts-linux-arm7/conv-mach-pedantic.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/netlrts-linux-arm7/conv-mach-pedantic.sh b/src/arch/netlrts-linux-arm7/conv-mach-pedantic.sh
deleted file mode 100644 (file)
index 033b6c3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-CMK_CC="$CMK_CC"
-CMK_CXX="$CMK_CXX -pedantic -Wno-long-long"
index 4547ccd4644a5244219ae1f2462cb27cb8e9c47f..4b9db447b765fc706d28b621a80810a7ba8a2d6a 100644 (file)
@@ -7,10 +7,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index 4c2b1462e22463ed6e8f8bc0ad6390f58e44438a..7e54045ac97190c184ecda236a7236259c68785f 100644 (file)
@@ -6,10 +6,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
diff --git a/src/arch/netlrts-linux-x86_64/conv-mach-pedantic.h b/src/arch/netlrts-linux-x86_64/conv-mach-pedantic.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/netlrts-linux-x86_64/conv-mach-pedantic.sh b/src/arch/netlrts-linux-x86_64/conv-mach-pedantic.sh
deleted file mode 100644 (file)
index 033b6c3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-CMK_CC="$CMK_CC"
-CMK_CXX="$CMK_CXX -pedantic -Wno-long-long"
index 4c2b1462e22463ed6e8f8bc0ad6390f58e44438a..7e54045ac97190c184ecda236a7236259c68785f 100644 (file)
@@ -6,10 +6,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index 1a2d25ef204bd0745a4a114670782e8040678e6a..eaded2c5d68488336f41cffb1cb41d1bf1155dfa 100644 (file)
@@ -1,6 +1,3 @@
-# -static to avoid missing dynamic libs
-CMK_LD="$CMK_LD "
-CMK_LDXX="$CMK_LDXX "
 CMK_LIBS="$CMK_LIBS -lbproc"
 CMK_NATIVE_LIBS="$CMK_NATIVE_LIBS -lbproc"
 CMK_BPROC=true
index 8a3c21826a50aaa98418a2fa4abdd259a44998f5..894cc35e34cef4d1019cba7025383f1f0b7a59f2 100644 (file)
@@ -1,12 +1,14 @@
 . $CHARMINC/cc-gcc.sh
 
-CMK_CPP_C="$CMK_CPP_C -m32"
-CMK_CC="$CMK_CC -m32"
-CMK_CXX="$CMK_CXX -m32"
+CMK_CPP_C_FLAGS="$CMK_CPP_C_FLAGS -m32"
+CMK_CC_FLAGS="$CMK_CC_FLAGS -m32"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -m32"
 #CMK_LD="$CMK_CC -Wl,--allow-multiple-definition "
 #CMK_LDXX="$CMK_CXX -Wl,--allow-multiple-definition "
 CMK_LD="$CMK_CC "
 CMK_LDXX="$CMK_CXX "
+CMK_LD_FLAGS="$CMK_CC_FLAGS "
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS "
 CMK_XIOPTS=''
 CMK_QT='i386-gcc'
 
index 8050fd0ad11b82b0d2772a169d47f9ccfbf3b350..f44b714ed09dbeec9be4525ab8bf6f91cecaeb2b 100644 (file)
@@ -1,14 +1,20 @@
-CMK_CC="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
-CMK_CPP_C="$CMK_CC -E"
+CMK_CC="$CHARMBIN/unix2nt_cc "
+CMK_CPP_C="$CMK_CC"
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CXX="$CHARMBIN/unix2nt_cc -D_CRT_SECURE_NO_DEPRECATE "
+CMK_CXX="$CHARMBIN/unix2nt_cc "
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
 
-CMK_SEQ_CC="$CMK_CC"
-CMK_SEQ_CXX="$CMK_CXX"
-CMK_SEQ_LD="$CMK_LD"
-CMK_SEQ_LDXX="$CMK_LDXX"
+CMK_CC_FLAGS="-D_CRT_SECURE_NO_DEPRECATE"
+CMK_CPP_C_FLAGS="$CMK_CC_FLAGS -E"
+CMK_CXX_FLAGS="-D_CRT_SECURE_NO_DEPRECATE"
+CMK_LD_FLAGS="$CMK_CC_FLAGS"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS"
+
+CMK_SEQ_CC="$CMK_CC $CMK_CC_FLAGS"
+CMK_SEQ_CXX="$CMK_CXX $CMK_CXX_FLAGS"
+CMK_SEQ_LD="$CMK_LD $CMK_LD_FLAGS"
+CMK_SEQ_LDXX="$CMK_LDXX $CMK_LDXX_FLAGS"
 
 CMK_CF77="f77"
 CMK_CF90="f90"
index e20f1c462663c87d7affb40048497089761cd78c..761b70ed9901e35a84b33c065736ea97546af51f 100644 (file)
@@ -16,12 +16,17 @@ then
  exit 1
 fi
 
-CMK_CXX="bgxlC_r -qhalt=e -qnokeyword=__int128 -qtls=local-exec -DCMK_USING_XLC=1"
-CMK_CC="bgxlc_r -qcpluscmt -qhalt=e -qnokeyword=__int128 -qtls=local-exec"
+CMK_CXX="bgxlC_r"
+CMK_CC="bgxlc_r"
 
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
 
+CMK_CXX_FLAGS="-qhalt=e -qnokeyword=__int128 -qtls=local-exec -DCMK_USING_XLC=1"
+CMK_CC_FLAGS="-qcpluscmt -qhalt=e -qnokeyword=__int128 -qtls=local-exec"
+CMK_LD_FLAGS="$CMK_CC_FLAGS"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS"
+
 CMK_CF77="bgxlf_r "
 CMK_CF90="bgxlf90_r  -qsuffix=f=f90"
 CMK_CF90_FIXED="bgxlf90_r "
index 407e86b4703b98e15f94ac84344e82f753404eb2..b2ea8814184976b0c27fc0de5947e947e569aec6 100644 (file)
@@ -8,12 +8,14 @@ CXX=xlC_r
 CC=xlc_r
 
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C="$CC -E"
+CMK_CPP_C="$CC"
 CMK_CC="$CC "
 CMK_CXX="$CXX "
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX "
 
+CMK_CPP_C_FLAGS="-E"
+
 CMK_C_OPTIMIZE='-O3 -g'
 CMK_CXX_OPTIMIZE='-O3 -g'
 
index e20f1c462663c87d7affb40048497089761cd78c..761b70ed9901e35a84b33c065736ea97546af51f 100644 (file)
@@ -16,12 +16,17 @@ then
  exit 1
 fi
 
-CMK_CXX="bgxlC_r -qhalt=e -qnokeyword=__int128 -qtls=local-exec -DCMK_USING_XLC=1"
-CMK_CC="bgxlc_r -qcpluscmt -qhalt=e -qnokeyword=__int128 -qtls=local-exec"
+CMK_CXX="bgxlC_r"
+CMK_CC="bgxlc_r"
 
 CMK_LD="$CMK_CC"
 CMK_LDXX="$CMK_CXX"
 
+CMK_CXX_FLAGS="-qhalt=e -qnokeyword=__int128 -qtls=local-exec -DCMK_USING_XLC=1"
+CMK_CC_FLAGS="-qcpluscmt -qhalt=e -qnokeyword=__int128 -qtls=local-exec"
+CMK_LD_FLAGS="$CMK_CC_FLAGS"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS"
+
 CMK_CF77="bgxlf_r "
 CMK_CF90="bgxlf90_r  -qsuffix=f=f90"
 CMK_CF90_FIXED="bgxlf90_r "
index ba6ac600b5ab8d9c2d1e92b0518a1a76676c5e2f..53e16155bf0b03673db77bef660e6d21e9cb7b0a 100644 (file)
@@ -7,11 +7,18 @@ CMK_INC="-I/opt/cray/mpt/5.2.0/xt/gemini/sma/include/"
 CMK_LD_PATH="-L/opt/cray/mpt/5.2.0/xt/gemini/sma/lib64/"
 
 CMK_CPP_CHARM="cpp -P"
-CMK_CPP_C="cc -E $CMK_INC"
-CMK_CC="cc $CMK_INC"
-CMK_CXX="CC $CMK_INC"
-CMK_LD="$CMK_CC $CMK_LD_DEFS $CMK_LD_PATH"
-CMK_LDXX="$CMK_CXX $CMK_LD_DEFS $CMK_LD_PATH"
+CMK_CPP_C="cc"
+CMK_CC="cc"
+CMK_CXX="CC"
+CMK_LD="$CMK_CC"
+CMK_LDXX="$CMK_CXX"
+
+CMK_CPP_C_FLAGS="-E $CMK_INC"
+CMK_CC_FLAGS="$CMK_INC"
+CMK_CXX_FLAGS="$CMK_INC"
+CMK_LD_FLAGS="$CMK_CC_FLAGS $CMK_LD_DEFS $CMK_LD_PATH"
+CMK_LDXX_FLAGS="$CMK_CXX_FLAGS $CMK_LD_DEFS $CMK_LD_PATH"
+
 CMK_LIBS="-lckqt -lsma -lrca"
 CMK_QT='generic64-light'
 
@@ -21,8 +28,8 @@ CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
 # compiler for compiling sequential programs
 if test -n "$PGCC"
 then
-CMK_CC="$CMK_CC -DCMK_FIND_FIRST_OF_PREDICATE=1 "
-CMK_CXX="$CMK_CXX -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
+CMK_CC_FLAGS="$CMK_CC_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 "
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -DCMK_FIND_FIRST_OF_PREDICATE=1 --no_using_std "
 # gcc is needed for building QT
 CMK_SEQ_CC="gcc -fPIC"
 CMK_SEQ_CXX="pgCC -fPIC --no_using_std "
index ba68bd66df1b8c7fe61978955db10aaae4172495..149881845676d70c6706ade0f17e396800584992 100644 (file)
@@ -1,8 +1,14 @@
 CMK_CPP_CHARM='cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc -D_REENTRANT -I/usr/opt/rms/include '
-CMK_CXX='g++ -D_REENTRANT -I/usr/opt/rms/include '
+CMK_CPP_C='gcc'
+CMK_CC='gcc '
+CMK_CXX='g++ '
 CMK_LD="eval $CMK_CC "
+
+CMK_CPP_C_FLAGS="-E"
+CMK_CC_FLAGS="-D_REENTRANT -I/usr/opt/rms/include"
+CMK_CXX_FLAGS="-D_REENTRANT -I/usr/opt/rms/include"
+CMK_LD_FLAGS="$CMK_CC_FLAGS"
+
 CMK_RANLIB='ranlib'
 CMK_LIBS='-lckqt'
 CMK_LD_LIBRARY_PATH="-rpath $CHARMLIBSO/"
index e419f4c6411e9a4b3081db58e542010f96d57a17..bf2c86aa969bd745289ac78b934ecd85f3f29a23 100644 (file)
@@ -1,6 +1,6 @@
 . $CHARMINC/cc-gcc.sh
 
-CMK_CXX="$CMK_CXX -Wno-deprecated"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -Wno-deprecated"
 CMK_CF77='f77'
 CMK_CF90='f90'
 CMK_QT='generic64-light'
index 46f14218911404933872dd45682864a255ca9a92..3b70f527c18160c855455cd0e0d02e8008a45207 100644 (file)
@@ -1,6 +1,6 @@
 . $CHARMINC/cc-gcc.sh
 
-CMK_CXX="$CMK_CXX -Wno-deprecated"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS -Wno-deprecated"
 CMK_CF77='f77'
 CMK_CF90='f90'
 CMK_QT='generic'
index 4bd56ae13fc25c0237611780e61b52376368a2c2..5e4a728b1a824d2bc148f872ac5298e29054affd 100644 (file)
@@ -7,10 +7,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
diff --git a/src/arch/verbs-linux-x86_64/conv-mach-pedantic.h b/src/arch/verbs-linux-x86_64/conv-mach-pedantic.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/verbs-linux-x86_64/conv-mach-pedantic.sh b/src/arch/verbs-linux-x86_64/conv-mach-pedantic.sh
deleted file mode 100644 (file)
index 033b6c3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-CMK_CC="$CMK_CC"
-CMK_CXX="$CMK_CXX -pedantic -Wno-long-long"
index 4bd56ae13fc25c0237611780e61b52376368a2c2..5e4a728b1a824d2bc148f872ac5298e29054affd 100644 (file)
@@ -7,10 +7,10 @@ CMK_WARNINGS_ARE_ERRORS='-Werror'
 CMK_CXX_OPTIMIZE='-O3'
 
 # native compiler for compiling charmxi, etc
-CMK_NATIVE_CC="$CMK_CC $CMK_DEFS "
-CMK_NATIVE_CXX="$CMK_CXX $CMK_DEFS "
-CMK_NATIVE_LD="$CMK_CC "
-CMK_NATIVE_LDXX="$CMK_CXX "
+CMK_NATIVE_CC="$CMK_CC $CMK_CC_FLAGS $CMK_DEFS "
+CMK_NATIVE_CXX="$CMK_CXX $CMK_CXX_FLAGS $CMK_DEFS "
+CMK_NATIVE_LD="$CMK_CC $CMK_CC_FLAGS "
+CMK_NATIVE_LDXX="$CMK_CXX $CMK_CXX_FLAGS "
 
 # native compiler for compiling charmxi, etc
 CMK_SEQ_CC="$CMK_NATIVE_CC"
index cb9f81c32cb1dfd0e8ec15fdd9ae0fb17c55916b..ec0766c1a22f0ba64e3705b2c7a5f14388cb6674 100755 (executable)
@@ -1308,7 +1308,7 @@ do
        DoNoErrCheck $RM $BASE.cpm.h $TMP.c
        Do touch $BASE.cpm.h
        Do $LN -f -s $FILE $TMP.c
-       Do $CMK_CPP_C -I$CHARMINC $CMK_SYSINC $OPTS_CC_GENCPM $OPTS_CPP $TMP.c > $TMP.i
+       Do $CMK_CPP_C $CMK_CPP_C_FLAGS -I$CHARMINC $CMK_SYSINC $OPTS_CC_GENCPM $OPTS_CPP $TMP.c > $TMP.i
        Do $CHARMBIN/conv-cpm $TMP.i $BASE.cpm.h
 done
 
@@ -1396,7 +1396,7 @@ do
                 fi
                ;;
        *.c|*.s|*.S)
-               Do $CMK_CC -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CC -c $FILE $DESTO
+               Do $CMK_CC $CMK_CC_FLAGS -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CC -c $FILE $DESTO
                NU_OBJ=$BASEO
                if [ "$Do_res" -ne 0 ]
                then
@@ -1408,7 +1408,7 @@ do
                 then
                     Do $CMK_NATIVE_CXX -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP -c $FILE $DESTO
                 else
-                    Do $CMK_CXX -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CXX -c $FILE $DESTO
+                    Do $CMK_CXX $CMK_CXX_FLAGS -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CXX -c $FILE $DESTO
                 fi
                NU_OBJ=$BASEO
                if [ "$Do_res" -ne 0 ]
@@ -1491,9 +1491,9 @@ MakeSO() {
        fi
        if test "$MAKE_LDXX" = "1"
        then
-         soCmd="$CMK_LDXX -o $OBJECT $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
+         soCmd="$CMK_LDXX $CMK_LDXX_FLAGS -o $OBJECT $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
        else
-         soCmd="$CMK_LD -o $OBJECT $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
+         soCmd="$CMK_LD $CMK_LD_FLAGS -o $OBJECT $OPTS_LD $OPTS_LDRO $OBJECTFILES $PRE_LIBRARIES $POST_LIBRARIES $CMK_LD_SHARED_LIBS"
        fi
        DoNoErrCheck $soCmd
        Do_res=$?
@@ -1688,7 +1688,7 @@ case "$LANGUAGE" in
          Do $CMK_NATIVE_LD $OPTS_LD -o $OBJECT $OBJECTFILES \
                -L$CHARMLIB $PRE_LIBRARIES $CMK_NATIVE_LIBS $POST_LIBRARIES
        else
-         Do $CMK_SEQ_LD $OPTS_LD -o $OBJECT $OBJECTFILES \
+         Do $CMK_SEQ_LD $CMK_LD_FLAGS $OPTS_LD -o $OBJECT $OBJECTFILES \
                -L$CHARMLIB $PRE_LIBRARIES $CMK_SEQ_LIBS $POST_LIBRARIES
        fi
        Copyobj
@@ -1699,7 +1699,7 @@ case "$LANGUAGE" in
          Do $CMK_NATIVE_LDXX $OPTS_LD -o $OBJECT $OBJECTFILES \
                -L$CHARMLIB $PRE_LIBRARIES $CMK_NATIVE_LIBS $POST_LIBRARIES
        else
-         Do $CMK_SEQ_LDXX $OPTS_LD -o $OBJECT $OBJECTFILES \
+         Do $CMK_SEQ_LDXX $CMK_LDXX_FLAGS $OPTS_LD -o $OBJECT $OBJECTFILES \
                -L$CHARMLIB $PRE_LIBRARIES $CMK_SEQ_LIBS $POST_LIBRARIES
        fi
        Copyobj
@@ -1942,7 +1942,7 @@ for trace in $TRACEMODE; do
 done
 echo "}" >> $modInitSrc
 
-Do $CMK_CXX $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CXX -c $modInitSrc -o $modInitObj
+Do $CMK_CXX $CMK_CXX_FLAGS $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CXX -c $modInitSrc -o $modInitObj
 
 ###############################################################################
 #
@@ -2045,9 +2045,9 @@ else
   # if interoperate, need a lib with moduleinit
   if [ "$MPI_INTEROPERATE" != "" ]
   then
-    LANG_LIBS="-L$CHARMLIB -I$CHARMINC $CMK_SYSINC $PRE_LIBRARIES"
+    LANG_LIBS="-L$CHARMLIB $PRE_LIBRARIES"
   else
-    LANG_LIBS="-L$CHARMLIB -I$CHARMINC $CMK_SYSINC $OBJECTFILES $modInitObj $PRE_LIBRARIES"
+    LANG_LIBS="-L$CHARMLIB $OBJECTFILES $modInitObj $PRE_LIBRARIES"
   fi
 fi
 if [ "$TRACE_WITH_TAU" = 1 ]
@@ -2092,13 +2092,13 @@ then
   OPTS_LD="$OPTS_LD $CMK_LD_SHARED $OPTS_LDRO -L$CHARMLIBSO"
   Debugf "Running ldro..."
   DoNoErrCheck $RM $OBJECT
-  [ "$MAKE_LDXX" = "1" ] && Do $CMK_LDXX $OPTS_LD $OPTS_LDXX -o $OBJECT $ALL_LIBS
-  [ "$MAKE_LD" = "1" ] && Do $CMK_LD $OPTS_LD -o $OBJECT $ALL_LIBS
+  [ "$MAKE_LDXX" = "1" ] && Do $CMK_LDXX $CMK_LDXX_FLAGS $OPTS_LD $OPTS_LDXX -o $OBJECT $ALL_LIBS
+  [ "$MAKE_LD" = "1" ] && Do $CMK_LD $CMK_LD_FLAGS $OPTS_LD -o $OBJECT $ALL_LIBS
   Copyobj
 else
 # Make a regular executable: call the appropriate linker
-  [ "$MAKE_LDXX" = "1" ] && Do $CMK_LDXX $OPTS_LD $OPTS_LDXX -o $OBJECT $ALL_LIBS
-  [ "$MAKE_LD" = "1" ] && Do $CMK_LD $OPTS_LD -o $OBJECT $ALL_LIBS
+  [ "$MAKE_LDXX" = "1" ] && Do $CMK_LDXX $CMK_LDXX_FLAGS $OPTS_LD $OPTS_LDXX -o $OBJECT $ALL_LIBS
+  [ "$MAKE_LD" = "1" ] && Do $CMK_LD $CMK_LD_FLAGS $OPTS_LD -o $OBJECT $ALL_LIBS
 fi
 
 ########################################################################
index 3a430cac706e1b0890475c25ca476a5ad7a3225e..3e82aa837405bacf2b3f6b3047b2eb1112c3f594 100644 (file)
@@ -342,8 +342,8 @@ test_cc() {
         AC_MSG_CHECKING("$1")
        echo "### $1" >> $charmout
        cat $tc >> $charmout
-       echo $CMK_CC -I../include -I. $CMK_LIBDIR $CMK_INCDIR $CMK_SYSINC $OPTS_CC $OPTS_LD -c $tc -o test.o $4 >> $charmout
-       $CMK_CC -I../include -I. $CMK_LIBDIR $CMK_INCDIR $CMK_SYSINC $OPTS_CC $OPTS_LD -c $tc -o test.o $4 > out 2>&1
+       echo $CMK_CC $CMK_CC_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CC -c $tc -o test.o $4 >> $charmout
+       $CMK_CC $CMK_CC_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CC -c $tc -o test.o $4 > out 2>&1
        test_result $? "$1" "$2" "$3"
        strictpass=$pass
        strictfail=$fail
@@ -366,8 +366,8 @@ test_cxx() {
         AC_MSG_CHECKING("$1")
        echo "### $1" >> $charmout
        cat $t >> $charmout
-       echo $CMK_CXX -I../include -I. $CMK_LIBDIR $CMK_INCDIR $CMK_SYSINC $OPTS_CXX $OPTS_LD -c $t -o test.o $4 >> $charmout
-       $CMK_CXX -I../include -I. $CMK_LIBDIR $CMK_INCDIR $CMK_SYSINC $OPTS_CXX $OPTS_LD -c $t -o test.o $4 > out 2>&1
+       echo $CMK_CXX $CMK_CXX_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $t -o test.o $4 >> $charmout
+       $CMK_CXX $CMK_CXX_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $t -o test.o $4 > out 2>&1
        test_result $? "$1" "$2" "$3"
        strictpass=$pass
        strictfail=$fail
@@ -390,14 +390,14 @@ test_link() {
         AC_MSG_CHECKING("$1")
        echo "### $1" >> $charmout
        cat $t >> $charmout
-       echo $CMK_CXX -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $t -o test.o $4 >> $charmout
-       $CMK_CXX -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $t -o test.o $4 > out 2>&1
+       echo $CMK_CXX $CMK_CXX_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $t -o test.o $4 >> $charmout
+       $CMK_CXX $CMK_CXX_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $t -o test.o $4 > out 2>&1
         if test $? -ne 0
         then
           test_result 1 "$1" "$2" "$3"
         else
-          echo $CMK_LDXX -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> $charmout
-          $CMK_LDXX -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> out 2>&1
+          echo $CMK_LDXX $CMK_LDXX_FLAGS -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> $charmout
+          $CMK_LDXX $CMK_LDXX_FLAGS -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> out 2>&1
           ret=$?
          test ! -x testlink && ret=1
           test_result $ret "$1" "$2" "$3"
@@ -423,14 +423,14 @@ test_linkc() {
         AC_MSG_CHECKING("$1")
        echo "### $1" >> $charmout
        cat $tc >> $charmout
-       echo $CMK_CC -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CC -c $tc -o test.o $4 >> $charmout
-       $CMK_CC -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CC -c $tc -o test.o $4 > out 2>&1
+       echo $CMK_CC $CMK_CC_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CC -c $tc -o test.o $4 >> $charmout
+       $CMK_CC $CMK_CC_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CC -c $tc -o test.o $4 > out 2>&1
         if test $? -ne 0
         then
           test_result 1 "$1" "$2" "$3"
         else
-          echo $CMK_LD -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> $charmout
-          $CMK_LD -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> out 2>&1
+          echo $CMK_LD $CMK_LD_FLAGS -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> $charmout
+          $CMK_LD $CMK_LD_FLAGS -o testlink test.o $CMK_LIBDIR $OPTS_LD $CMK_SYSLIBS $4 >> out 2>&1
           test_result $? "$1" "$2" "$3"
         fi
        strictpass=$pass
@@ -455,14 +455,14 @@ test_linkso() {
         AC_MSG_CHECKING("$1")
        echo $1 >> $charmout
        cat $t >> $charmout
-       echo $CMK_CXX -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX $CMK_PIC -c $t -o test.o $4 >> $charmout
-       $CMK_CXX -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $CMK_PIC $t -o test.o $4 > out 2>&1
+       echo $CMK_CXX $CMK_CXX_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX $CMK_PIC -c $t -o test.o $4 >> $charmout
+       $CMK_CXX $CMK_CXX_FLAGS -I../include -I. $CMK_INCDIR $CMK_SYSINC $OPTS_CXX -c $CMK_PIC $t -o test.o $4 > out 2>&1
         if test $? = 1
         then
           test_result 1 "$1" "$2" "$3"
         else
-         echo $CMK_LD -I../include -I. $CMK_LIBDIR $OPTS_LD $CMK_LD_SHARED $CMK_SYSLIBS test.o -o testlink.$CMK_SHARED_SUF $4 >> $charmout
-         $CMK_LD -I../include -I. $CMK_LIBDIR $OPTS_LD $CMK_LD_SHARED $CMK_SYSLIBS test.o -o testlink.$CMK_SHARED_SUF $4 > out 2>&1
+         echo $CMK_LD $CMK_LD_FLAGS $CMK_LIBDIR $OPTS_LD $CMK_LD_SHARED $CMK_SYSLIBS test.o -o testlink.$CMK_SHARED_SUF $4 >> $charmout
+         $CMK_LD $CMK_LD_FLAGS $CMK_LIBDIR $OPTS_LD $CMK_LD_SHARED $CMK_SYSLIBS test.o -o testlink.$CMK_SHARED_SUF $4 > out 2>&1
          test_result $? "$1" "$2" "$3"
        fi
        cat out >> $charmout
index 95f5021bcde6becfd223deab5f56d39a1e7f4c26..0e976e8bfa9ea2978892f571b6c8c63162298f43 100644 (file)
@@ -63,12 +63,6 @@ then
 . $CHARMINC/conv-mach-opt.sh
 fi
 
-CMK_CPP_C="$CMK_CPP_C $CMK_DEFS "
-CMK_CC="$CMK_CC $CMK_DEFS "
-CMK_CXX="$CMK_CXX $CMK_DEFS "
-CMK_LD="$CMK_LD $CMK_DEFS "
-CMK_LDXX="$CMK_LDXX $CMK_DEFS "
-
 CMK_CC_RELIABLE="$CMK_CC_RELIABLE $CMK_DEFS "
 CMK_CC_FASTEST="$CMK_CC_FASTEST $CMK_DEFS "
 
@@ -95,6 +89,12 @@ OPTS_LDXX="$OPTS_LDXX $USER_OPTS_LDXX"
 [ -z "$CMK_SEQ_RANLIB" ] && CMK_SEQ_RANLIB="$CMK_RANLIB"
 [ -z "$CMK_SEQ_LIBS" ] && CMK_SEQ_LIBS="$CMK_NATIVE_LIBS"
 
+CMK_CPP_C_FLAGS="$CMK_CPP_C_FLAGS $CMK_DEFS"
+CMK_CC_FLAGS="$CMK_CC_FLAGS $CMK_DEFS"
+CMK_CXX_FLAGS="$CMK_CXX_FLAGS $CMK_DEFS"
+CMK_LD_FLAGS="$CMK_LD_FLAGS $CMK_DEFS"
+CMK_LDXX_FLAGS="$CMK_LDXX_FLAGS $CMK_DEFS"
+
 [ -z "$CMK_CELL" ] && CMK_CELL=0
 
 [ -z "$CMK_C_OPENMP" ] && CMK_C_OPENMP="-fopenmp"