summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-07-27 14:08:51 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-07-27 14:08:51 +0000
commite6fccc4f373cf075864fbecbed8bd5d614311227 (patch)
treed12940092ca7f0809c409d1a0a04297beaef4f5d
parent26236e38cea4d34777990d5f18961d67e9cfaf30 (diff)
downloadATCD-e6fccc4f373cf075864fbecbed8bd5d614311227.tar.gz
added overrides of .so build rules to change them .o builds.
-rw-r--r--include/makeinclude/platform_vxworks5.x_g++.GNU36
-rw-r--r--include/makeinclude/platform_vxworks5.x_ghs.GNU4
2 files changed, 24 insertions, 16 deletions
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 309153d9d87..c35a9033399 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -39,30 +39,34 @@ endif # PPC604
#### END CPU-specific settings
-TARGET_DIR = $(WIND_BASE)/target
-HOST_DIR = $(WIND_BASE)/host/sun4-solaris2
-BIN_DIR = $(HOST_DIR)/bin
+TARGET_DIR = $(WIND_BASE)/target
+HOST_DIR = $(WIND_BASE)/host/sun4-solaris2
+BIN_DIR = $(HOST_DIR)/bin
-CC = cc$(TOOLENV)
-CXX = g++$(TOOLENV)
-CFLAGS += -DVXWORKS -D_REENTRANT -I. -I$(ACE_ROOT) -I$(WIND_BASE)/target/h -ansi -fno-builtin -fno-defer-pop -fvolatile -nostdinc -nostdlib -O -pipe -Wall
+CC = cc$(TOOLENV)
+CXX = g++$(TOOLENV)
+CFLAGS += -DVXWORKS -D_REENTRANT -I. -I$(ACE_ROOT) -I$(WIND_BASE)/target/h -ansi -fno-builtin -fno-defer-pop -fvolatile -nostdinc -nostdlib -O -pipe -Wall
#### Note: -f-no-implicit-templates doesn't seem to work well with
#### g++ cygnus-2.7.2-960126 for pc486 target. Some
#### member functions don't get instantiated. Wind River knows
#### about this problem (SPR 8483).
-CCFLAGS += $(DCFLAGS) $(CFLAGS) #### -fno-implicit-templates
-DCFLAGS += -g
-INCLDIRS +=
-LD = ld$(TOOLENV)
-LDFLAGS += -X -r .obj/__ctordtor.o
-PIC =
-AR = ar$(TOOLENV)
-ARFLAGS = rv
-RANLIB = /bin/true
-PRELINK = nm$(TOOLENV) .obj/$@.o $(ACE_ROOT)/ace/libACE.a | munch | egrep -v '\.cpp' > __ctordtor.c; $(COMPILE.c) -traditional -o .obj/__ctordtor.o __ctordtor.c; /bin/rm __ctordtor.c;
+CCFLAGS += $(DCFLAGS) $(CFLAGS) #### -fno-implicit-templates
+DCFLAGS += -g
+INCLDIRS +=
+LD = ld$(TOOLENV)
+LDFLAGS += -X -r .obj/__ctordtor.o
+PIC =
+AR = ar$(TOOLENV)
+ARFLAGS = rv
+RANLIB = /bin/true
+PRELINK = nm$(TOOLENV) .obj/$@.o $(ACE_ROOT)/ace/libACE.a | munch | egrep -v '\.cpp' > __ctordtor.c; $(COMPILE.c) -traditional -o .obj/__ctordtor.o __ctordtor.c; /bin/rm __ctordtor.c;
#### don't build shared objects:
BUILD = $(VOBJS) $(VLIB) $(VBIN)
+OBJDIRS = .obj
+SHOBJ = $(addsuffix .o,$(FILES))
+SOEXT = o
+VSHDIR = .obj/
#### ld can't handle INCLDIRS, so override LINK definitions.
LINK.c = override
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index ebd56133370..f946193bd18 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -21,3 +21,7 @@ PRELIB = (echo "int main() { return 0; }" > gcctemp.c && \
#### don't build shared objects:
BUILD = $(VOBJS) $(VLIB) $(VBIN)
+OBJDIRS = .obj
+SHOBJ = $(addsuffix .o,$(FILES))
+SOEXT = o
+VSHDIR = .obj/