summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2001-02-07 00:05:50 +0000
committerSteve Huston <shuston@riverace.com>2001-02-07 00:05:50 +0000
commita652d7865291c2c09da29abf2d52772ca67d5e7c (patch)
tree12d63a4d1c8f2211ce857e6db6f69f4af90dcb82
parent96d0d3e8679f2387e3300b44c34711ac3cc8a1d3 (diff)
downloadATCD-a652d7865291c2c09da29abf2d52772ca67d5e7c.tar.gz
ChangeLogTag:Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--include/makeinclude/platform_sunos5_sunc++.GNU4
4 files changed, 21 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f8b08dfc3c..cbf19338292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com>
+
+ * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure
+ to add CFLAGS into CCFLAGS, even if no other options are added. Else
+ things get built without -mt.
+
Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com>
* tests/Thread_Mutex_Test.cpp: Changed wording of the message for
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 4f8b08dfc3c..cbf19338292 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com>
+
+ * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure
+ to add CFLAGS into CCFLAGS, even if no other options are added. Else
+ things get built without -mt.
+
Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com>
* tests/Thread_Mutex_Test.cpp: Changed wording of the message for
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 4f8b08dfc3c..cbf19338292 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Tue Feb 06 19:03:35 2001 Steve Huston <shuston@riverace.com>
+
+ * include/makeinclude/platform_sunos5_sunc++.GNU: For C++ 5, make sure
+ to add CFLAGS into CCFLAGS, even if no other options are added. Else
+ things get built without -mt.
+
Tue Feb 06 18:37:41 2001 Steve Huston <shuston@riverace.com>
* tests/Thread_Mutex_Test.cpp: Changed wording of the message for
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index edbe3c277d7..009338193c9 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -93,13 +93,15 @@ ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION)))
#### CC 5.0.
inline = 0
+ CCFLAGS += $(CFLAGS)
+
#### If compat=4 is desired, set up for that. There are syntactic diffs
#### in the compatibility modes, but here all we need to be concerned with
#### is turning on -compat=4, and not trying to enable the new libraries.
#### RTTI may work, but has not been tested. To try it, cut/paste the
#### rtti conditions from the 4.2 section, above.
ifeq ($(compat4),1)
- CCFLAGS += -compat=4 $(CFLAGS) -DACE_LACKS_RTTI -instances=explicit
+ CCFLAGS += -compat=4 -DACE_LACKS_RTTI -instances=explicit
endif # compat4 requested
endif # CC 5.0 or later
endif # ! 4.2