Using gcc 4.4 compatible flags for darwin versions of charm.
authorIsaac Dooley <idooley2@illinois.edu>
Fri, 16 Oct 2009 22:20:06 +0000 (22:20 +0000)
committerIsaac Dooley <idooley2@illinois.edu>
Fri, 16 Oct 2009 22:20:06 +0000 (22:20 +0000)
src/arch/net-darwin-x86/conv-mach.sh
src/arch/net-darwin-x86_64/conv-mach.sh

index edfb04338d8a818f382fa72e2825e608bbb66af4..1648d5178f62c37f78a52d446e371c1dbcaaa435 100644 (file)
@@ -1,10 +1,10 @@
 CMK_MACOSX=1
 
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CPP_C="gcc -E"
-CMK_CC="gcc -fPIC -dynamic -fno-common "
-CMK_CXX="g++ -fPIC -dynamic -fno-common "
-CMK_CXXPP="g++ -x g++ -E "
+CMK_CPP_C="gcc -m32 -E"
+CMK_CC="gcc -m32 -fPIC -dynamic -fno-common "
+CMK_CXX="g++ -m32 -fPIC -dynamic -fno-common "
+CMK_CXXPP="g++ -m32 -x g++ -E "
 CMK_LDXX="$CMK_CXX -multiply_defined suppress "
 CMK_XIOPTS=""
 CMK_QT="generic-light"
@@ -19,7 +19,7 @@ CMK_CF90="g90"
 # need -lstdc++ for c++ reference, and it needs to be put at very last 
 # of command line.
 # Mac environment varaible
-test -z "$MACOSX_DEPLOYMENT_TARGET" && export MACOSX_DEPLOYMENT_TARGET=10.3
+test -z "$MACOSX_DEPLOYMENT_TARGET" && export MACOSX_DEPLOYMENT_TARGET=10.5
 CMK_SHARED_SUF="dylib"
 CMK_LD_SHARED=" -dynamic -dynamiclib -undefined dynamic_lookup "
 CMK_LD_SHARED_LIBS="-lstdc++"
index a9f72fb768997246fc7ad0b521b3494ffcce1000..dda5267807a0d20510ae30504ec65f26a8d4538f 100644 (file)
@@ -1,10 +1,10 @@
 CMK_MACOSX=1
 
 CMK_CPP_CHARM="/usr/bin/cpp -P"
-CMK_CPP_C="gcc -arch x86_64 -E"
-CMK_CC="gcc -arch x86_64 -fPIC -dynamic -fno-common "
-CMK_CXX="g++ -arch x86_64 -fPIC -dynamic -fno-common "
-CMK_CXXPP="g++ -arch x86_64 -x g++ -E "
+CMK_CPP_C="gcc -m64 -E"
+CMK_CC="gcc -m64 -fPIC -dynamic -fno-common "
+CMK_CXX="g++ -m64 -fPIC -dynamic -fno-common "
+CMK_CXXPP="g++ -m64  -x g++ -E "
 CMK_LDXX="$CMK_CXX -multiply_defined suppress "
 CMK_XIOPTS=""
 CMK_QT="generic64-light"