diff options
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_sunos5_sunc++.GNU | 9 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3854eaeb661..e1bded79662 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Mon Sep 18 10:56:29 UTC 2006 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_sunos5_sunc++.GNU: Add buildbits=64 + branch for Sun Studio 11 (Sun C++ 5.8). Thanks to Aleksandar + Vukajlovic <vukajlo at finsoft dot co dot yu> for this. + + * THANKS: Added Aleksandar Vukajlovic to the Hall of Fame. + Thu Sep 14 23:01:16 UTC 2006 Steve Huston <shuston@riverace.com> * ace/Bound_Ptr.inl: Tweak syntax to try and work around apparant diff --git a/ACE/THANKS b/ACE/THANKS index a3c049793db..41cae21f1b1 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2148,6 +2148,7 @@ Andy Salnikov <a_salnikov at yahoo dot com> Hieu Ngyuen <hieu dot t dot nguyen at vanderbilt dot edu> Andriy Gapon <avg at icyb dot net dot ua> Andy Wang <ypwangandy at gmail dot com> +Aleksandar Vukajlovic <vukajlo at finsoft dot co dot yu> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU index 62c9dcfc62b..7186fd6e001 100644 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU @@ -192,8 +192,13 @@ else # ! 4.2 CFLAGS += -xarch=generic64 LDFLAGS += -xarch=generic64 else - CFLAGS += -xarch=v9 - LDFLAGS += -xarch=v9 + ifeq (C++ 5.8,$(findstring C++ 5.7,$(CC_VERSION))) + CFLAGS += -xarch=generic64 + LDFLAGS += -xarch=generic64 + else + CFLAGS += -xarch=v9 + LDFLAGS += -xarch=v9 + endif # C++ 5.8 endif # C++ 5.7 endif # buildbits endif # CC 5.0 |