diff options
| -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 |