diff --git a/config/CONFIG.Vx b/config/CONFIG.Vx index f7201861d..a38011a7b 100644 --- a/config/CONFIG.Vx +++ b/config/CONFIG.Vx @@ -37,27 +37,28 @@ GNU_BIN = $(VX_GNU_BIN_$(TORNADO)) GNU_LIB = $(VX_GNU_LIB_$(TORNADO)) #-------------------------------------------------- -# Tornado command definitions +# VxWorks command definitions GCC = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc -G++ = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc +AR = $(GNU_BIN)/ar$(CMPLR_SUFFIX) +CPP = $(GNU_BIN)/cpp$(CMPLR_SUFFIX) -nostdinc +RANLIB = $(GNU_BIN)/ranlib$(CMPLR_SUFFIX) +LD = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r + +#-------------------------------------------------- +# Tornado C++ crosscompiler definitions CPLUSPLUS_YES = G++ -AR_YES = $(GNU_BIN)/ar$(CMPLR_SUFFIX) -CPP_YES = $(GNU_BIN)/cpp$(CMPLR_SUFFIX) -nostdinc -RANLIB_YES = $(GNU_BIN)/ranlib$(CMPLR_SUFFIX) -LD_YES = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r +G++ = $(GNU_BIN)/cc$(CMPLR_SUFFIX) -B$(GNU_LIB)/gcc-lib/ -nostdinc +LD_G++ = $(GNU_BIN)/ld$(CMPLR_SUFFIX) -r #-------------------------------------------------- # Pre Tornado C++ crosscompiler definitions # These are pre tornado definitions for Hideos builds (defined for 68k only) -CCC = $(GNU_DIR)/bin/sun3-g++ -B$(GNU_DIR)/lib/gcc-lib/ -nostdinc -DEXPL_TEMPL CPLUSPLUS_NO = CCC -AR_NO = $(GNU_DIR)/bin/sun3-ar -CPP_NO = $(GNU_DIR)/bin/sun3-cpp -LD_NO = $(GNU_DIR)/bin/sun3-ld $(OLD_ARCH_DEP_LDFLAGS) -r -RANLIB_NO = $(GNU_DIR)/bin/sun3-ranlib +CCC = $(GNU_DIR)/bin/sun3-g++ -B$(GNU_DIR)/lib/gcc-lib/ -nostdinc -DEXPL_TEMPL +LD_CCC = $(GNU_DIR)/bin/sun3-ld $(OLD_ARCH_DEP_LDFLAGS) -r CCC_NORMAL = $(CCC) $(OLD_ARCH_DEP_CFLAGS) CCC_STRICT = $(CCC) -ansi -pedantic -Wtraditional $(OLD_ARCH_DEP_CFLAGS) @@ -77,15 +78,11 @@ OLD_ARCH_DEP_LDFLAGS = -Ur -N -T$(EPICS_BASE_BIN)/vxldscript.MRI #-------------------------------------------------- # C compiler definitions ANSI = GCC -#####CMPLR = ANSI #-------------------------------------------------- # Command definitions CPLUSPLUS = $(CPLUSPLUS_$(TORNADO)) -AR = $(AR_$(TORNADO)) -CPP = $(CPP_$(TORNADO)) -RANLIB = $(RANLIB_$(TORNADO)) -LD = $(LD_$(TORNADO)) +LD_CXX = $(LD_$(CPLUSPLUS)) #-------------------------------------------------- # Operating system flags