diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc
index ed23a503d..fbbb01649 100644
--- a/configure/os/CONFIG.Common.hpux-parisc
+++ b/configure/os/CONFIG.Common.hpux-parisc
@@ -28,7 +28,7 @@ empty:=                                      # trick from the make docs...
 space:= $(empty) $(empty)
 RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=parisc-hp-unix
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.linux-386 b/configure/os/CONFIG.Common.linux-386
index 5e1b5d74b..b840a5c1c 100644
--- a/configure/os/CONFIG.Common.linux-386
+++ b/configure/os/CONFIG.Common.linux-386
@@ -12,7 +12,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 
 ARCH_DEP_CFLAGS = -march=i386
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=i386-pc-linux-gnu
 endif
 
diff --git a/configure/os/CONFIG.Common.linux-486 b/configure/os/CONFIG.Common.linux-486
index dafd1f964..611ed2e4f 100644
--- a/configure/os/CONFIG.Common.linux-486
+++ b/configure/os/CONFIG.Common.linux-486
@@ -12,7 +12,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 
 ARCH_DEP_CFLAGS = -march=i486
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=i486-pc-linux-gnu
 endif
 
diff --git a/configure/os/CONFIG.Common.linux-586 b/configure/os/CONFIG.Common.linux-586
index c94c4e20e..00fdb48b1 100644
--- a/configure/os/CONFIG.Common.linux-586
+++ b/configure/os/CONFIG.Common.linux-586
@@ -13,7 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 # i586 is euivalent to pentiumpro
 ARCH_DEP_CFLAGS = -march=i586
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=i586-pc-linux-gnu
 endif
 
diff --git a/configure/os/CONFIG.Common.linux-686 b/configure/os/CONFIG.Common.linux-686
index 6c0d61a93..2f4e6bf00 100644
--- a/configure/os/CONFIG.Common.linux-686
+++ b/configure/os/CONFIG.Common.linux-686
@@ -13,7 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 # i686 is euivalent to pentiumpro
 ARCH_DEP_CFLAGS = -march=i686
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=i686-pc-linux-gnu
 endif
 
diff --git a/configure/os/CONFIG.Common.linux-athlon b/configure/os/CONFIG.Common.linux-athlon
index 56188ee6b..6c01433f8 100644
--- a/configure/os/CONFIG.Common.linux-athlon
+++ b/configure/os/CONFIG.Common.linux-athlon
@@ -13,7 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 ARCH_DEP_CFLAGS += -march=athlon-mp -mfpmath=sse
 
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=athlon-pc-linux-gnu
 endif
 
diff --git a/configure/os/CONFIG.Common.linux-mpc82xx b/configure/os/CONFIG.Common.linux-mpc82xx
index 4bf113939..3ab8cbc68 100644
--- a/configure/os/CONFIG.Common.linux-mpc82xx
+++ b/configure/os/CONFIG.Common.linux-mpc82xx
@@ -29,7 +29,7 @@ OP_SYS_LDLIBS = -lrt
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=ppc_82xx
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86
index f3f337e63..9331f8d46 100644
--- a/configure/os/CONFIG.Common.linux-x86
+++ b/configure/os/CONFIG.Common.linux-x86
@@ -29,7 +29,7 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
 ifeq ($(EPICS_HOST_ARCH),linux-x86)
    # Added for 386,486,... cross builds
    CMPLR_PREFIX=
diff --git a/configure/os/CONFIG.Common.linux-x86-borland b/configure/os/CONFIG.Common.linux-x86-borland
index 33493ddbc..64f957b51 100644
--- a/configure/os/CONFIG.Common.linux-x86-borland
+++ b/configure/os/CONFIG.Common.linux-x86-borland
@@ -24,7 +24,7 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES))
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=i586-pc-linux-gnu
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.lynxos-x86 b/configure/os/CONFIG.Common.lynxos-x86
index 3930e698d..54198060f 100644
--- a/configure/os/CONFIG.Common.lynxos-x86
+++ b/configure/os/CONFIG.Common.lynxos-x86
@@ -23,7 +23,7 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 ARCH_DEP_LDFLAGS =
 ARCH_DEP_LDLIBS =
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=x86-lynxos
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.osf-alpha b/configure/os/CONFIG.Common.osf-alpha
index 52b1a7c06..41e60a61a 100644
--- a/configure/os/CONFIG.Common.osf-alpha
+++ b/configure/os/CONFIG.Common.osf-alpha
@@ -22,7 +22,7 @@ POSIX_LDLIBS_NO +=
 
 OP_SYS_CPPFLAGS = -D_OSF_SOURCE
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=alpha-osf
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc
index fa0e6bd67..7d4bdd798 100644
--- a/configure/os/CONFIG.Common.solaris-sparc
+++ b/configure/os/CONFIG.Common.solaris-sparc
@@ -30,7 +30,7 @@ OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION)
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=sparc-sun-solaris2
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86
index d46356bc8..642ae5b59 100644
--- a/configure/os/CONFIG.Common.solaris-x86
+++ b/configure/os/CONFIG.Common.solaris-x86
@@ -31,7 +31,7 @@ ARCH_DEP_CPPFLAGS = -D_X86_
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=x86-sun-solaris2
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))
diff --git a/configure/os/CONFIG.Common.sun4-x86 b/configure/os/CONFIG.Common.sun4-x86
index ae6526f77..f00d5b710 100644
--- a/configure/os/CONFIG.Common.sun4-x86
+++ b/configure/os/CONFIG.Common.sun4-x86
@@ -26,7 +26,7 @@ ARCH_DEP_CPPFLAGS += -D_X86_
 # Set runtime path for shared libraries
 RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
 
-ifdef CROSS
+ifeq ($(BUILD_CLASS),CROSS)
    GNU_TARGET=x86-sun-sunos4
    CMPLR_SUFFIX=
    CMPLR_PREFIX=$(addsuffix -,$(GNU_TARGET))