diff options
author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-07-05 11:14:14 +0000 |
---|---|---|
committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-07-05 11:14:14 +0000 |
commit | d7c78e42474cbe7a73f08c46d252eef5e28aef7c (patch) | |
tree | efb535225628777bf75f70feb5e388a733094b2b | |
parent | 55a8ab1c8b2d3ff2ad7b3325f87e78b8976a6169 (diff) | |
download | cryptopp-d7c78e42474cbe7a73f08c46d252eef5e28aef7c.tar.gz |
port to Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@500 57ff6487-cd31-0410-9ec3-f628ee90f5f0
-rw-r--r-- | GNUmakefile | 4 | ||||
-rw-r--r-- | stdcpp.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index b32392b..e32c5e4 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -86,7 +86,9 @@ endif ifeq ($(UNAME),SunOS) LDLIBS += -lnsl -lsocket ifeq ($(CXX),CC) # override flags for CC (Solaris native C++ compiler) -CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef -m$(shell isainfo -b) +# -DCRYPTOPP_INCLUDE_STD_CC is needed for Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 +# remove it if you get "already had a body defined" errors in vector.cc +CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef -DCRYPTOPP_INCLUDE_STD_CC -m$(shell isainfo -b) LDFLAGS = AR = CC ARFLAGS = -xar -o @@ -14,7 +14,7 @@ #include <map> #include <vector> -#ifdef __SUNPRO_CC +#ifdef CRYPTOPP_INCLUDE_STD_CC // workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 #include <vector.cc> #endif |