ChangeLogTag: Tue Oct 13 19:00:53 UTC 2009 Olli Savia <ops@iki.fi>

2 files changed, 7 insertions, 42 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 87b8e21d55d..18f71bf9829 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,14 +1,19 @@
+Tue Oct 13 19:00:53 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_lynxos.GNU:
+          Removed non-functional cross compiler setup.
+
 Tue Oct 13 18:56:22 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * include/makeinclude/platform_lynxos.GNU:
           Reverted:
 
           Mon Oct 13 11:10:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
-        
+
                   * include/makeinclude/platform_lynxos.GNU:
                     Problems with Lynxos5.0 due to -mshared being passed to compiler
                     (inaddition to linker)
-        
+
           -mshared is needed on LynxOS 4.x. Need to find another
           solution for LynxOS 5.0
 
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 28362627593..1991f459382 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -3,18 +3,6 @@
 # LynxOS with g++.  Defaults to LynxOS Version 4.0.0.  For Version 4.2.0,
 # for example, add "VERSION=4.2.0" to your make invocation.
 
-#### NOTE:  It's best to create a file that includes this one, instead
-#### of symlinking it.  That way, you can easily override the default
-#### configuration.  For example, to configure for a PowerPC target, I
-#### use a include/makeinclude/platform_macros.GNU that contains the
-#### following lines (without comment markers):
-####
-####     LYNXTARGET = ppc
-####     include $(ACE_ROOT)/include/makeinclude/platform_lynxos.GNU
-####
-#### Similarly, the default VERSION and HOST_OS settings (see below)
-#### can be overridden for your particular platform.
-
 ifeq ($(shell uname -s),LynxOS)
   export VERSION=$(shell uname -r)
 
@@ -24,37 +12,9 @@ ifeq ($(shell uname -s),LynxOS)
 else
   CROSS-COMPILE = 1
 
-  #### The following may need to be customized for your host or target type.
-  #### Or, you can source the appropriate (for your shell) Lynx SETUP file
-  #### before running "make".
-
   ifeq (,$(VERSION))
     export VERSION = 4.0.0
   endif # VERSION
-
-  ifeq (,$(LYNXTARGET))
-    export LYNXTARGET = x86
-  endif # LYNXTARGET
-
-  ifeq (,$(OBJSFORMAT))
-    export OBJSFORMAT = elf
-  endif # OBJSFORMAT
-
-  ifeq (,$(HOST_OS))
-    export HOST_OS = linux
-  endif # HOST_OS
-
-  ifeq (,$(HOST_OS_REVISION))
-    export HOST_OS_REVISION = $(shell uname -r)
-  endif # HOST_OS_REVISION
-
-  ifeq (,$(ENV_PREFIX))
-    export ENV_PREFIX = /usr/lynx/$(VERSION)/$(LYNXTARGET)
-  endif # ENV_PREFIX
-
-  ifeq (,$(findstring $(ENV_PREFIX),$(PATH)))
-    export PATH := $(ENV_PREFIX)/cdk/$(HOST_OS)-$(OBJSFORMAT)-$(LYNXTARGET)/bin:$(ENV_PREFIX)/cdk/$(HOST_OS)-$(OBJSFORMAT)-$(LYNXTARGET)/usr/bin:$(PATH)
-  endif # PATH
 endif # ! LynxOS
 
 LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}')