summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-22 16:15:55 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-22 16:15:55 +0000
commit2b1f0d6551e104395e45e731edfe3fc2bd8aa603 (patch)
tree93b222094c34d811ef164f4330d74a4e9554e367
parent2e0751e048ffdee5fd283c23d543ee415183ce49 (diff)
downloadATCD-2b1f0d6551e104395e45e731edfe3fc2bd8aa603.tar.gz
unset SHLIB to avoid fix builds without PRELIB
-rw-r--r--include/makeinclude/platform_vxworks5.x_g++.GNU5
-rw-r--r--include/makeinclude/platform_vxworks5.x_ghs.GNU27
2 files changed, 16 insertions, 16 deletions
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index a636f69924f..161eeaa940f 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -64,9 +64,10 @@ PRELINK = nm$(TOOLENV) .obj/$@.o $(ACE_ROOT)/ace/libACE.a | munch | egre
#### don't build shared objects:
BUILD = $(VOBJS) $(VLIB) $(VBIN)
OBJDIRS = .obj
+SHLIB =
SHOBJ = $(addsuffix .o,$(FILES))
SOEXT = o
-VSHDIR = .obj/
+VSHDIR = .obj/
#### ld can't handle INCLDIRS, so override LINK definitions.
LINK.c = override
@@ -75,5 +76,3 @@ LINK.c.override = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS)
LINK.cc = override
LINK.cc.override = $(PRELINK) $(LD) $(PTDIRS)
POSTLINK = ; VX_CPU_FAMILY=$(TOOLENV) xsymDec < $@ > $@.sym
-
-
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index b08c61302d8..07056328188 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -2,23 +2,24 @@
# VxWorks 5.2-5.3.1 with Green Hills 1.8.8
-CC = cxvxppc
-CXX = $(CC)
-CFLAGS += $(DCFLAGS)
-CCFLAGS += $(CFLAGS) --no_rtti -tnone
-DCFLAGS += -g
-DLD = $(CXX)
-LD = $(CXX)
-LDFLAGS = --no_auto_instantiation
+CC = cxvxppc
+CXX = $(CC)
+CFLAGS += $(DCFLAGS)
+CCFLAGS += $(CFLAGS) --no_rtti -tnone
+DCFLAGS += -g
+DLD = $(CXX)
+LD = $(CXX)
+LDFLAGS = --no_auto_instantiation
LIBS += /appl/newgreen/vxppc603/ghsbltin.o /appl/newgreen/vxppc603/ghsmath.o
-PIC =
-AR = ax
-ARFLAGS = rv
-RANLIB = /bin/true
+PIC =
+AR = ax
+ARFLAGS = rv
+RANLIB = /bin/true
#### don't build shared objects:
BUILD = $(VOBJS) $(VLIB) $(VBIN)
OBJDIRS = .obj
+SHLIB =
SHOBJ = $(addsuffix .o,$(FILES))
SOEXT = o
-VSHDIR = .obj/
+VSHDIR = .obj/