summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-03-17 19:23:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-03-17 19:23:15 +0000
commitf65779d553feab5faa9df4154d04e9277353c756 (patch)
tree8abe3e71e18aee523e01f477c92c1cfa51171d81
parentba3dde4254f0ae8394b4ebaf2a13b0ef65d62f55 (diff)
downloadATCD-f65779d553feab5faa9df4154d04e9277353c756.tar.gz
ChangeLogTag: Mon Mar 17 19:22:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog11
-rw-r--r--include/makeinclude/platform_cygwin32.GNU10
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a2ecf5b07e..2d8c7c7c07c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Mar 17 19:20:54 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/platform_cygwin32.GNU:
+ Set threads to 0 when it is not defined yet. From the Cygwin daily
+ build we found that threading is just partly enabled with Cygwin.
+ First tries to enable it completely resulted in a lot of new errors,
+ so for the time being disable threads by default and then start
+ working on getting everything working with threading enabled.
+ Also removed setting of optimized and the --enable-auto-import
+ because they are not needed.
+
Mon Mar 17 09:58:48 2003 Chad Elliott <elliott_c@ociweb.com>
* ace/ace.mpc:
diff --git a/include/makeinclude/platform_cygwin32.GNU b/include/makeinclude/platform_cygwin32.GNU
index d776538c59d..71ee0639793 100644
--- a/include/makeinclude/platform_cygwin32.GNU
+++ b/include/makeinclude/platform_cygwin32.GNU
@@ -1,5 +1,4 @@
# $Id$
-
#
# This file should allow to build ACE for cygwin32 with cygwin tools.
#
@@ -17,15 +16,14 @@ TCPU = pentiumpro
#TCPU = i386
cygwin32 = 1
-optimize = 0
+
+ifeq (,$(threads))
+ threads = 0
+endif
# Cygwin doesn't allow to add the version number of ACE to the dll name
# because fe ace.dll.5.2.3 isn't a valid dll name
SONAME=
SOVERSION=
-# Add --enable-auto-import to the linker flags. This will result in the
-# linker doing auto-import without giving warnings about it.
-LDFLAGS += --enable-auto-import
-
include $(ACE_ROOT)/include/makeinclude/platform_gnuwin32_common.GNU