diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-28 14:33:28 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-28 14:33:28 +0000 |
| commit | f98b42e0afdb4c629f4479050b5d81f7138dff65 (patch) | |
| tree | 144ae680ea2891824ce86ca2c07062781a565ea2 | |
| parent | 9851ad7c4eac2a9c1526e27fa343dc71328817ab (diff) | |
| download | ATCD-f98b42e0afdb4c629f4479050b5d81f7138dff65.tar.gz | |
Sun Jun 28 14:33:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_sunos5_sunc++.GNU:
Fixed compile problem with SunStudio 12 Update 1
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_sunos5_sunc++.GNU | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 78965f2f08f..a504c9b6181 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 28 14:33:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_sunos5_sunc++.GNU: + Fixed compile problem with SunStudio 12 Update 1 + Sat Jun 27 00:55:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * rpmbuild/ace-tao-ciao.spec: diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU index 0c4663d5796..4119f0a4aa3 100644 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU @@ -159,9 +159,14 @@ ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) CFLAGS += -m64 LDFLAGS += -m64 else - CFLAGS += -xarch=v9 - LDFLAGS += -xarch=v9 - endif + ifeq (C++ 5.10,$(findstring C++ 5.10,$(CC_VERSION))) + CFLAGS += -m64 + LDFLAGS += -m64 + else + CFLAGS += -xarch=v9 + LDFLAGS += -xarch=v9 + endif # C++ 5.10 + endif # C++ 5.9 endif # C++ 5.8 endif # C++ 5.7 endif # buildbits |