diff --git a/configure/CONFIG.CrossCommon b/configure/CONFIG.CrossCommon
index 2b030b6ce..8de8c811c 100644
--- a/configure/CONFIG.CrossCommon
+++ b/configure/CONFIG.CrossCommon
@@ -26,6 +26,9 @@ export GCC_EXEC_PREFIX = $(GNU_LIB)/gcc-lib/
 CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
 CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
 
+CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
+CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASSS))
+
 # All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon
 
diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc
index 9986025f5..fa3a30894 100644
--- a/configure/os/CONFIG.Common.hpux-parisc
+++ b/configure/os/CONFIG.Common.hpux-parisc
@@ -28,8 +28,4 @@ empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
 RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=parisc-hp-unix
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=parisc-hp-unix
diff --git a/configure/os/CONFIG.Common.linux-x86-borland b/configure/os/CONFIG.Common.linux-x86-borland
index 64f957b51..76259445c 100644
--- a/configure/os/CONFIG.Common.linux-x86-borland
+++ b/configure/os/CONFIG.Common.linux-x86-borland
@@ -24,9 +24,3 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=i586-pc-linux-gnu
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
-
diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc
index cb0be76d7..7bda34afe 100644
--- a/configure/os/CONFIG.Common.solaris-sparc
+++ b/configure/os/CONFIG.Common.solaris-sparc
@@ -31,12 +31,7 @@ OP_SYS_LDFLAGS +=  $(COMPILER_LDFLAGS)
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
-
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=sparc-sun-solaris2
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=sparc-sun-solaris2
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd
diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86
index b2ba31f7c..07de71f04 100644
--- a/configure/os/CONFIG.Common.solaris-x86
+++ b/configure/os/CONFIG.Common.solaris-x86
@@ -32,11 +32,7 @@ ARCH_DEP_CPPFLAGS = -D_X86_
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 
-ifeq ($(BUILD_CLASS),CROSS)
-   GNU_TARGET=x86-sun-solaris2
-   CMPLR_SUFFIX=
-   CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
-endif
+GNU_TARGET=x86-sun-solaris2
 
 OP_SYS_LDLIBS += -lsocket -lnsl
 OP_SYS_LDLIBS_8 += -lCrun -lc -lCstd