From cdbbf69a1eaee41d0b8be8b50212b202c2b5a6b6 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Wed, 12 Mar 1997 23:08:37 +0000 Subject: [PATCH] Modified names for CXX flags. --- config/CONFIG.Vx.68k | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/config/CONFIG.Vx.68k b/config/CONFIG.Vx.68k index 23328bbe8..df97fc1bc 100644 --- a/config/CONFIG.Vx.68k +++ b/config/CONFIG.Vx.68k @@ -8,7 +8,6 @@ RANLIB = $(VX_GNU_BIN)/ranlib68k YACC = $(EYACC) LEX = $(ELEX) CC = $(VX_GNU_BIN)/cc68k -B$(VX_GNU_LIB)/gcc-lib/ -nostdinc -CXX = $(VX_GNU_BIN)/cc68k -B$(VX_GNU_LIB)/gcc-lib/ -nostdinc -DEXPL_TEMPL CPP = $(VX_GNU_BIN)/cpp68k -nostdinc #CPP = $(CC) -E GCC = $(CC) @@ -39,7 +38,7 @@ CCC_CCFLAGS = CCC_ARCH_DEP_CCFLAGS = CCC_ARCH_DEP_LDFLAGS = -G++ = $(GNU_BIN)/sun3-g++ -B$(GNU_LIB)/gcc-lib/ -nostdinc +G++ = $(GNU_BIN)/sun3-g++ -B$(GNU_LIB)/gcc-lib/ -nostdinc -DEXPL_TEMPL AR_G++ = $(GNU_BIN)/sun3-ar CPP_G++ = $(GNU_BIN)/sun3-cpp RANLIB_G++ = $(GNU_BIN)/sun3-ranlib @@ -62,8 +61,9 @@ CPP_CXX = $(CPP_$(CPLUSPLUS)) RANLIB_CXX = $(RANLIB_$(CPLUSPLUS)) LD_CXX = $(LD_$(CPLUSPLUS)) -ARCH_DEP_CCFLAGS += $($(CPLUSPLUS)_ARCH_DEP_CCFLAGS) -CXX_ARCH_DEP_LDFLAGS = $($(CPLUSPLUS)_ARCH_DEP_LDFLAGS) +ARCH_DEP_CXXFLAGS += $($(CPLUSPLUS)_ARCH_DEP_CCFLAGS) $(ARCH_DEP_CFLAGS) +ARCH_DEP_CXXLDFLAGS = $($(CPLUSPLUS)_ARCH_DEP_LDFLAGS) $(ARCH_DEP_LDFLAGS) + # special c library requirements SPECIAL_LANG = @@ -91,18 +91,20 @@ VX_OP_SYS_FLAGS = -DvxWorks -DV5_vxWorks # Arch dependent flags are set in CONFIG_ARCH.* VX_CFLAGS = $(VX_OPT_FLAGS) $(VX_WARN_FLAGS) \ $(VX_INCLUDES) $(VX_OP_SYS_FLAGS) +VX_CXXFLAGS += $(VX_CFLAGS) VX_LDFLAGS = -o TARGET_CFLAGS = $($(basename $@)_CFLAGS) +TARGET_CXXFLAGS = $($(basename $@)_CXXFLAGS) TARGET_LDFLAGS = $($(basename $@)_LDFLAGS) TARGET_CPPFLAGS = $($(basename $@)_CPPFLAGS) TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS) CFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(VX_CFLAGS) -CXXFLAGS = $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS) $(ARCH_DEP_CCFLAGS) $(VX_CFLAGS) -LDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(VX_LDFLAGS) -CXXLDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(CXX_ARCH_DEP_LDFLAGS) $(VX_LDFLAGS) +CXXFLAGS = $(TARGET_CXXFLAGS) $(USR_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(VX_CXXFLAGS) +LDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(VX_LDFLAGS) +CXXLDFLAGS = $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(ARCH_DEP_CXXLDFLAGS) $(VX_LDFLAGS) CPPFLAGS += $(TARGET_CPPFLAGS) $(USR_CPPFLAGS) # Build compile line here COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c