diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 093250c70..5c88e3bf7 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -85,11 +85,11 @@ GNU_BIN = $(GNU_DIR)/bin GNU_LIB = $(GNU_DIR)/lib export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/ -GCC = $(GNU_BIN)/$(GNU_TARGET_PREFIX)cc$(CMPLR_SUFFIX) +GCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX) -GCC_AR = $(GNU_BIN)/$(GNU_TARGET_PREFIX)ar$(CMPLR_SUFFIX) -rc +GCC_AR = $(GNU_BIN)/$(CMPLR_PREFIX)ar$(CMPLR_SUFFIX) -rc GCC_CPP = $(GCC) -x c -E -GCC_RANLIB = $(GNU_BIN)/$(GNU_TARGET_PREFIX)ranlib$(CMPLR_SUFFIX) +GCC_RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX) GCC_CMPLR_CPPFLAGS_ANSI = -ansi GCC_CMPLR_CPPFLAGS_STRICT = -ansi -pedantic -Wtraditional @@ -105,7 +105,7 @@ GCC_BUILD_CPPFLAGS_CROSS = -nostdinc GCC_SHRLIB_LDFLAGS_YES = -shared GCC_POSIX_CPPFLAGS = -D_POSIX_C_SOURCE=199506L -D_POSIX_THREADS -D_REENTRANT -G++ = $(GNU_BIN)/$(GNU_TARGET_PREFIX)cc$(CMPLR_SUFFIX) +G++ = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX) G++_CMPLR_CPPFLAGS_NORMAL = -ansi -pedantic G++_CMPLR_CPPFLAGS_STRICT = -ansi -pedantic -Wtraditional diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index e408f82db..90cba502b 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -42,7 +42,7 @@ GNU_DIR = $(VX_DIR)/host/$(WIND_HOST_TYPE) #------------------------------------------------------- # Command definition overrides -GCC_LD = $(GNU_BIN)/$(GNU_TARGET_PREFIX)ld$(CMPLR_SUFFIX) -r +GCC_LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r # use ld partial linking not ar to create libraries) GCC_AR = $(GCC_LD) @@ -51,7 +51,7 @@ GCC_RANLIB = #-------------------------------------------------- # C++ host processing -NM = $(GNU_BIN)/$(GNU_TARGET_PREFIX)nm$(CMPLR_SUFFIX) +NM = $(GNU_BIN)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX) ifneq ($(wildcard $(GNU_BIN)/munch.tcl),) #tornado2 export WIND_BASE = $(VX_DIR) @@ -62,7 +62,7 @@ endif MUNCH = $(GNU_BIN)/wtxtcl$(HOSTEXE) $(GNU_BIN)/munch.tcl -asm $(ARCH_CLASS) else #tornado101 -MUNCH = $(GNU_BIN)/$(GNU_TARGET_PREFIX)munch$(EXE) +MUNCH = $(GNU_BIN)/$(CMPLR_PREFIX)munch$(EXE) endif #-------------------------------------------------------