summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-10-13 06:34:32 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-10-13 06:34:32 +0000
commit7bfb342059ad57353e71cf9a5a88c582c7c51119 (patch)
tree9905f67af9114516dc1d4a5aa08bc36480f84f07
parenteeb417c6491b6b43b6124da7544cc712067164a5 (diff)
downloadATCD-7bfb342059ad57353e71cf9a5a88c582c7c51119.tar.gz
Tue Oct 13 06:34:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_linux.GNU: When doing a 64bit build, also add -m64 to the linker flags
-rw-r--r--ACE/ChangeLog12
-rw-r--r--ACE/include/makeinclude/platform_linux.GNU1
2 files changed, 4 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0c90aa0adb6..2661c20e272 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,13 +1,7 @@
-Tue Oct 13 06:22:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+Tue Oct 13 06:34:48 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
- * etc/bczar/bczar.html:
- Added instruction to update copy_script
-
- * docs/Download.html:
- Updated latest micro to 5.7.4
-
- * etc/index.html:
- Added 5.7.4
+ * include/makeinclude/platform_linux.GNU:
+ When doing a 64bit build, also add -m64 to the linker flags
Mon Oct 12 14:03:48 CDT 2009 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index 30ad3fc1309..f33a58ba5ca 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -52,6 +52,7 @@ ifeq ($(buildbits),32)
endif
ifeq ($(buildbits),64)
FLAGS_C_CC += -m64
+ LDFLAGS += -m64
endif
#