diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-26 14:41:43 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-26 14:41:43 +0000 |
| commit | c986aa2cb5636e79385346236cae6818a6104af8 (patch) | |
| tree | 3ab6399f7905d3443466d0bbe40f697e36fda271 | |
| parent | b67c10a8ab3009ed044e488f50f7103f861344a8 (diff) | |
| download | ATCD-c986aa2cb5636e79385346236cae6818a6104af8.tar.gz | |
add VxWorks host bin directory to PATH if it's not already there
| -rw-r--r-- | include/makeinclude/platform_vxworks5.x_g++.GNU | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU index 69c8e67468f..e329ec46aa4 100644 --- a/include/makeinclude/platform_vxworks5.x_g++.GNU +++ b/include/makeinclude/platform_vxworks5.x_g++.GNU @@ -21,6 +21,23 @@ shared_libs = static_libs = 1 +ifeq (,$(WIND_BASE)) + default: + @ERROR: you must set your WIND_BASE environment variable +endif # WIND_BASE + +ifeq (,$(WIND_HOST_TYPE)) + default: + @ERROR: you must set your WIND_HOST_TYPE environment variable +endif # WIND_HOST_TYPE + +HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) + +ifeq (,$(findstring $(HOST_DIR)/bin,$PATH)) + PATH +=:$(HOST_DIR)/bin +endif # PATH + + #### BEGIN target CPU-specific settings #### This is kind of messy so that it can support multiple @@ -31,9 +48,8 @@ static_libs = 1 #### #### WIND_BASE = /project/doc/wind #### WIND_HOST_TYPE = sun4-solaris2 -#### PATH += :$(WIND_BASE)/host/$(WIND_HOST_TYPE)/bin -#### #### CPU = I80486 +#### #### include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU #### #### 2) modify the code below to set CPU, or @@ -55,20 +71,6 @@ endif # PPC604 #### END target CPU-specific settings -ifeq (,$(WIND_BASE)) - default: - @ERROR: you must set your WIND_BASE environment variable -endif # WIND_BASE - -ifeq (,$(WIND_HOST_TYPE)) - default: - @ERROR: you must set your WIND_HOST_TYPE environment variable -endif # WIND_HOST_TYPE - - -TARGET_DIR = $(WIND_BASE)/target -HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) -BIN_DIR = $(HOST_DIR)/bin #### Set up Win32 vs. Unix host specific macros. ifeq ($(WIND_HOST_TYPE),x86-win32) @@ -78,6 +80,7 @@ else # ! x86-win32 PIPE_OPT = -pipe endif # ! x86-win32 + CC = cc$(TOOLENV) CFLAGS += -DVXWORKS -D_REENTRANT -ansi -fno-builtin -fno-defer-pop -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -Wall #### Note: -f-no-implicit-templates doesn't seem to work well with @@ -92,13 +95,14 @@ LD = $(PERL_PATH) $(ACE_ROOT)/bin/ace_ld -c \ -m "munch" -n "nm$(TOOLENV)" ld$(TOOLENV) LDFLAGS += -X -r #### WindRiver only recommends -O, not -O2, with some CPUs, including -#### the i386 family. +#### the i386 family. And -O2 causes some compilation failures. OCFLAGS += -O PIC = AR = ar$(TOOLENV) ARFLAGS = rv RANLIB = /bin/true + #### ld can't handle INCLDIRS, so override LINK definitions. LINK.c = override LINK.c.override = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS) @@ -106,6 +110,7 @@ LINK.c.override = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS) LINK.cc = override LINK.cc.override = $(LD) + #### The symbol table extractor is target-dependent. ifeq ($(CPU),I80486) BINXSYM_NAME = xsymDec |