[Pkg-db-devel] Bug#284843: db4.2: [PATCH] cross build

NIIBE Yutaka NIIBE Yutaka <gniibe@fsij.org>, 284843@bugs.debian.org
Thu, 09 Dec 2004 15:14:50 +0900


Package: db4.2
Severity: wishlist

Cross-building db4.2 package, I needed following patch.

In the current source package of db4.2, I think that there is a
mistake of usage of DEB_BUILD_{GNU_CPU,GNU_TYPE}.  It turns out
mistake on cross build, where:
	DEB_BUILD_{GNU_CPU,GNU_TYPE} != DEB_HOST_{GNU_CPU,GNU_TYPE}

BUILD specifies the build environment where we build the resulted
executables.

HOST specifies the host environment where the resulted executables
run.

Besides, as same as db3 source package, we need to fix Makefile,
because we need to run libtool (instead of CC or CXX), it is libtool
which invoke CC and CXX.  In the cross build environment, the variable
CC and CXX are defined, so, we need to avoid variable conflict.

  * debian/rules: Do configure with --host on cross build.
    Define DEB_HOST_GNU_TYPE.
    Replace DEB_BUILD_GNU_CPU to DEB_HOST_GNU_CPU.
    Replace DEB_BUILD_GNU_TYPE to DEB_HOST_GNU_TYPE.
    Added M32R in JAVA_UNSUPPORTED_CPUS.

  * dist/Makefile.in: Replace the variable CC to CC_DRIVER, and CSS to
    CCX_DRIVER.

 -- NIIBE Yutaka <gniibe@fsij.org>  Thu,  9 Dec 2004 14:36:09 +0900

--- db4.2-4.2.52/debian/rules
+++ db4.2-4.2.52/debian/rules
@@ -18,8 +18,12 @@
 
 DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
+endif
 
-JAVA_UNSUPPORTED_CPUS = zhppaz zmipsz zmipselz
+JAVA_UNSUPPORTED_CPUS = zhppaz zmipsz zmipselz zm32rz
 JAVA_UNSUPPORTED_SYSTEMS = zgnuz zkfreebsd-gnuz zknetbsd-gnuz
 
 CONFIGURE_VARS =  CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.4" 
@@ -34,12 +38,12 @@
 			--with-uniquename \
 			--enable-tcl \
 			--with-tcl=/usr/lib/tcl8.4 \
-			--enable-test
+			--enable-test $(CONFARGS)
 
 DB_BINARY_PKGS = libdb4.2 libdb4.2-dev libdb4.2++ libdb4.2++-dev libdb4.2-tcl db4.2-util
 
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 CONFIGURE_VARS += JAVAC="gcj-wrapper" JAR="fastjar"
 CONFIGURE_SWITCHES += --enable-java
 DB_BINARY_PKGS += libdb4.2-java
@@ -137,8 +141,8 @@
 	cp -a debian/tmp/usr/bin debian/$(package)-util/usr
 	cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \
 	        debian/tmp/usr/lib/*.la debian/lib$(package)-dev/usr/lib
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	cp -a debian/tmp/usr/lib/db.jar \
 		debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar
 	ln -s lib$(package)-java-$(version).jar \
@@ -148,8 +152,8 @@
 	mv debian/lib$(package)-dev/usr/lib/*cxx* debian/lib$(package)++-dev/usr/lib
 	mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include
 	mv debian/lib$(package)-dev/usr/lib/*tcl* debian/lib$(package)-tcl/usr/lib
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	mv debian/lib$(package)-dev/usr/lib/*java* debian/lib$(package)-java/usr/lib
 endif
 endif
@@ -172,8 +176,8 @@
 	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
 	echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs
 	echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs
 endif
 endif
--- db4.2-4.2.52.orig/dist/Makefile.in
+++ db4.2-4.2.52/dist/Makefile.in
@@ -53,7 +53,7 @@
 # C API.
 ##################################################
 CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@
-CC=		@MAKEFILE_CC@
+CC_DRIVER=		@MAKEFILE_CC@
 CCLINK=		@MAKEFILE_CCLINK@
 
 LDFLAGS=	@LDFLAGS@
@@ -74,7 +74,7 @@
 # C++ support is optional, and can be built with static or shared libraries.
 ##################################################
 CXXFLAGS=	-c $(CPPFLAGS) @CXXFLAGS@
-CXX=		@MAKEFILE_CXX@
+CXX_DRIVER=		@MAKEFILE_CXX@
 CXXLINK=	@MAKEFILE_CXXLINK@
 XSOLINK=	@MAKEFILE_XSOLINK@
 LIBXSO_LIBS=	@LIBXSO_LIBS@
@@ -918,27 +918,27 @@
 # Multi-threaded testers, benchmarks.
 ##################################################
 dbs@o@: $(srcdir)/test_server/dbs.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_am@o@: $(srcdir)/test_server/dbs_am.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_checkpoint@o@: $(srcdir)/test_server/dbs_checkpoint.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_debug@o@: $(srcdir)/test_server/dbs_debug.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_handles@o@: $(srcdir)/test_server/dbs_handles.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_log@o@: $(srcdir)/test_server/dbs_log.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_qam@o@: $(srcdir)/test_server/dbs_qam.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_spawn@o@: $(srcdir)/test_server/dbs_spawn.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_trickle@o@: $(srcdir)/test_server/dbs_trickle.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_util@o@: $(srcdir)/test_server/dbs_util.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbs_yield@o@: $(srcdir)/test_server/dbs_yield.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 DBS_OBJS=\
 	dbs@o@ dbs_am@o@ dbs_checkpoint@o@ dbs_debug@o@ dbs_handles@o@ \
 	dbs_log@o@ dbs_qam@o@ dbs_spawn@o@ dbs_trickle@o@ dbs_util@o@ \
@@ -949,47 +949,47 @@
 	$(POSTLINK) $@
 
 db_perf@o@: $(srcdir)/test_perf/db_perf.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_checkpoint@o@: $(srcdir)/test_perf/perf_checkpoint.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_config@o@: $(srcdir)/test_perf/perf_config.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_dbs@o@: $(srcdir)/test_perf/perf_dbs.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_dead@o@: $(srcdir)/test_perf/perf_dead.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_debug@o@: $(srcdir)/test_perf/perf_debug.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_file@o@: $(srcdir)/test_perf/perf_file.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_key@o@: $(srcdir)/test_perf/perf_key.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_log@o@: $(srcdir)/test_perf/perf_log.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_misc@o@: $(srcdir)/test_perf/perf_misc.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_op@o@: $(srcdir)/test_perf/perf_op.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_parse@o@: $(srcdir)/test_perf/perf_parse.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_rand@o@: $(srcdir)/test_perf/perf_rand.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_spawn@o@: $(srcdir)/test_perf/perf_spawn.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_stat@o@: $(srcdir)/test_perf/perf_stat.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_sync@o@: $(srcdir)/test_perf/perf_sync.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_thread@o@: $(srcdir)/test_perf/perf_thread.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_trickle@o@: $(srcdir)/test_perf/perf_trickle.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_txn@o@: $(srcdir)/test_perf/perf_txn.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_util@o@: $(srcdir)/test_perf/perf_util.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 perf_vx@o@: $(srcdir)/test_perf/perf_vx.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 DBPERF_OBJS=\
 	db_perf@o@ perf_checkpoint@o@ perf_config@o@ perf_dbs@o@ \
 	perf_dead@o@ perf_debug@o@ perf_file@o@ perf_key@o@ perf_log@o@ \
@@ -1003,7 +1003,7 @@
 	$(POSTLINK) $@
 
 tm@o@: $(srcdir)/mutex/tm.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 tm: tm@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) tm@o@ $(DEF_LIB) @LOAD_LIBS@ $(LIBS)
 	$(POSTLINK) $@
@@ -1012,68 +1012,68 @@
 # Example programs for C.
 ##################################################
 bench_001@o@: $(srcdir)/examples_c/bench_001.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 bench_001: bench_001@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) bench_001@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_access@o@: $(srcdir)/examples_c/ex_access.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_access: ex_access@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_access@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_apprec@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_apprec_auto@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_auto.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_apprec_rec@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_rec.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 EX_APPREC_OBJS=ex_apprec@o@ ex_apprec_auto@o@ ex_apprec_rec@o@
 ex_apprec: $(EX_APPREC_OBJS) $(DEF_LIB)
 	$(CCLINK) -o $@ \
 	    $(LDFLAGS) $(EX_APPREC_OBJS) $(DEF_LIB) @LOAD_LIBS@ $(LIBS)
 
 ex_btrec@o@: $(srcdir)/examples_c/ex_btrec.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_btrec: ex_btrec@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_btrec@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_dbclient@o@: $(srcdir)/examples_c/ex_dbclient.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_dbclient: ex_dbclient@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_dbclient@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_env@o@: $(srcdir)/examples_c/ex_env.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_env: ex_env@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_env@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_lock@o@: $(srcdir)/examples_c/ex_lock.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_lock: ex_lock@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_lock@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_mpool@o@: $(srcdir)/examples_c/ex_mpool.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_mpool: ex_mpool@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_mpool@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
 
 ex_rq_client@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_client.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_rq_main@o@:	$(srcdir)/examples_c/ex_repquote/ex_rq_main.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_rq_master@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_master.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_rq_net@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_net.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_rq_util@o@: $(srcdir)/examples_c/ex_repquote/ex_rq_util.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 EX_RQ_OBJS=\
 	ex_rq_client@o@ ex_rq_main@o@ ex_rq_master@o@ ex_rq_net@o@ ex_rq_util@o@
 ex_repquote: $(EX_RQ_OBJS) $(DEF_LIB)
@@ -1082,14 +1082,14 @@
 	$(POSTLINK) $@
 
 ex_thread@o@: $(srcdir)/examples_c/ex_thread.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_thread: ex_thread@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ \
 	    $(LDFLAGS) ex_thread@o@ $(DEF_LIB) @LOAD_LIBS@ $(LIBS)
 	$(POSTLINK) $@
 
 ex_tpcb@o@: $(srcdir)/examples_c/ex_tpcb.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 ex_tpcb: ex_tpcb@o@ $(DEF_LIB)
 	$(CCLINK) -o $@ $(LDFLAGS) ex_tpcb@o@ $(DEF_LIB) $(LIBS)
 	$(POSTLINK) $@
@@ -1098,37 +1098,37 @@
 # Example programs for C++.
 ##################################################
 AccessExample@o@: $(srcdir)/examples_cxx/AccessExample.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 excxx_access: AccessExample@o@ $(DEF_LIB_CXX)
 	$(CXXLINK) -o $@ $(LDFLAGS) AccessExample@o@ $(DEF_LIB_CXX) $(LIBS)
 	$(POSTLINK) $@
 
 BtRecExample@o@: $(srcdir)/examples_cxx/BtRecExample.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 excxx_btrec: BtRecExample@o@ $(DEF_LIB_CXX)
 	$(CXXLINK) -o $@ $(LDFLAGS) BtRecExample@o@ $(DEF_LIB_CXX) $(LIBS)
 	$(POSTLINK) $@
 
 EnvExample@o@: $(srcdir)/examples_cxx/EnvExample.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 excxx_env: EnvExample@o@ $(DEF_LIB_CXX)
 	$(CXXLINK) -o $@ $(LDFLAGS) EnvExample@o@ $(DEF_LIB_CXX) $(LIBS)
 	$(POSTLINK) $@
 
 LockExample@o@: $(srcdir)/examples_cxx/LockExample.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 excxx_lock: LockExample@o@ $(DEF_LIB_CXX)
 	$(CXXLINK) -o $@ $(LDFLAGS) LockExample@o@ $(DEF_LIB_CXX) $(LIBS)
 	$(POSTLINK) $@
 
 MpoolExample@o@: $(srcdir)/examples_cxx/MpoolExample.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 excxx_mpool: MpoolExample@o@ $(DEF_LIB_CXX)
 	$(CXXLINK) -o $@ $(LDFLAGS) MpoolExample@o@ $(DEF_LIB_CXX) $(LIBS)
 	$(POSTLINK) $@
 
 TpcbExample@o@: $(srcdir)/examples_cxx/TpcbExample.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 excxx_tpcb: TpcbExample@o@ $(DEF_LIB_CXX)
 	$(CXXLINK) -o $@ $(LDFLAGS) TpcbExample@o@ $(DEF_LIB_CXX) $(LIBS)
 	$(POSTLINK) $@
@@ -1137,495 +1137,495 @@
 # C API build rules.
 ##################################################
 aes_method@o@: $(srcdir)/crypto/aes_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_compare@o@: $(srcdir)/btree/bt_compare.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_conv@o@: $(srcdir)/btree/bt_conv.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_curadj@o@: $(srcdir)/btree/bt_curadj.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_cursor@o@: $(srcdir)/btree/bt_cursor.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_delete@o@: $(srcdir)/btree/bt_delete.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_method@o@: $(srcdir)/btree/bt_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_open@o@: $(srcdir)/btree/bt_open.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_put@o@: $(srcdir)/btree/bt_put.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_rec@o@: $(srcdir)/btree/bt_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_reclaim@o@: $(srcdir)/btree/bt_reclaim.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_recno@o@: $(srcdir)/btree/bt_recno.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_rsearch@o@: $(srcdir)/btree/bt_rsearch.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_search@o@: $(srcdir)/btree/bt_search.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_split@o@: $(srcdir)/btree/bt_split.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_stat@o@: $(srcdir)/btree/bt_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_upgrade@o@: $(srcdir)/btree/bt_upgrade.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 bt_verify@o@: $(srcdir)/btree/bt_verify.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 btree_auto@o@: $(srcdir)/btree/btree_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 crdel_auto@o@: $(srcdir)/db/crdel_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 crdel_rec@o@: $(srcdir)/db/crdel_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 crypto@o@: $(srcdir)/crypto/crypto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 crypto_stub@o@: $(srcdir)/common/crypto_stub.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db185@o@: $(srcdir)/db185/db185.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db@o@: $(srcdir)/db/db.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_am@o@: $(srcdir)/db/db_am.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_auto@o@: $(srcdir)/db/db_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_byteorder@o@: $(srcdir)/common/db_byteorder.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_cam@o@: $(srcdir)/db/db_cam.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_conv@o@: $(srcdir)/db/db_conv.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_dispatch@o@: $(srcdir)/db/db_dispatch.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_dup@o@: $(srcdir)/db/db_dup.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_err@o@: $(srcdir)/common/db_err.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_getlong@o@: $(srcdir)/common/db_getlong.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_idspace@o@: $(srcdir)/common/db_idspace.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_iface@o@: $(srcdir)/db/db_iface.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_join@o@: $(srcdir)/db/db_join.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_log2@o@: $(srcdir)/common/db_log2.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_meta@o@: $(srcdir)/db/db_meta.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_method@o@: $(srcdir)/db/db_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_open@o@: $(srcdir)/db/db_open.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_overflow@o@: $(srcdir)/db/db_overflow.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_ovfl_vrfy@o@: $(srcdir)/db/db_ovfl_vrfy.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_pr@o@: $(srcdir)/db/db_pr.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_rec@o@: $(srcdir)/db/db_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_reclaim@o@: $(srcdir)/db/db_reclaim.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_rename@o@: $(srcdir)/db/db_rename.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_remove@o@: $(srcdir)/db/db_remove.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_ret@o@: $(srcdir)/db/db_ret.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_salloc@o@: $(srcdir)/env/db_salloc.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_shash@o@: $(srcdir)/env/db_shash.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_truncate@o@: $(srcdir)/db/db_truncate.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_upg@o@: $(srcdir)/db/db_upg.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_upg_opd@o@: $(srcdir)/db/db_upg_opd.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_vrfy@o@: $(srcdir)/db/db_vrfy.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_vrfyutil@o@: $(srcdir)/db/db_vrfyutil.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 db_vrfy_stub@o@: $(srcdir)/db/db_vrfy_stub.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 dbm@o@: $(srcdir)/dbm/dbm.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 dbreg@o@: $(srcdir)/dbreg/dbreg.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 dbreg_auto@o@: $(srcdir)/dbreg/dbreg_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 dbreg_rec@o@: $(srcdir)/dbreg/dbreg_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 dbreg_util@o@: $(srcdir)/dbreg/dbreg_util.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 env_file@o@: $(srcdir)/env/env_file.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 env_method@o@: $(srcdir)/env/env_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 env_open@o@: $(srcdir)/env/env_open.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 env_recover@o@: $(srcdir)/env/env_recover.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 env_region@o@: $(srcdir)/env/env_region.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 fileops_auto@o@: $(srcdir)/fileops/fileops_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 fop_basic@o@: $(srcdir)/fileops/fop_basic.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 fop_rec@o@: $(srcdir)/fileops/fop_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 fop_util@o@: $(srcdir)/fileops/fop_util.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash@o@: $(srcdir)/hash/hash.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_auto@o@: $(srcdir)/hash/hash_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_conv@o@: $(srcdir)/hash/hash_conv.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_dup@o@: $(srcdir)/hash/hash_dup.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_func@o@: $(srcdir)/hash/hash_func.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_meta@o@: $(srcdir)/hash/hash_meta.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_method@o@: $(srcdir)/hash/hash_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_open@o@: $(srcdir)/hash/hash_open.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_page@o@: $(srcdir)/hash/hash_page.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_rec@o@: $(srcdir)/hash/hash_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_reclaim@o@: $(srcdir)/hash/hash_reclaim.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_stat@o@: $(srcdir)/hash/hash_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_stub@o@: $(srcdir)/hash/hash_stub.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_upgrade@o@: $(srcdir)/hash/hash_upgrade.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hash_verify@o@: $(srcdir)/hash/hash_verify.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hmac@o@: $(srcdir)/hmac/hmac.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 hsearch@o@: $(srcdir)/hsearch/hsearch.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 lock@o@: $(srcdir)/lock/lock.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 lock_deadlock@o@:$(srcdir)/lock/lock_deadlock.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 lock_method@o@:$(srcdir)/lock/lock_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 lock_region@o@:$(srcdir)/lock/lock_region.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 lock_stat@o@:$(srcdir)/lock/lock_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 lock_util@o@:$(srcdir)/lock/lock_util.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 log@o@: $(srcdir)/log/log.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 log_archive@o@: $(srcdir)/log/log_archive.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 log_compare@o@: $(srcdir)/log/log_compare.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 log_get@o@: $(srcdir)/log/log_get.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 log_method@o@: $(srcdir)/log/log_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 log_put@o@: $(srcdir)/log/log_put.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_alloc@o@: $(srcdir)/mp/mp_alloc.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_bh@o@: $(srcdir)/mp/mp_bh.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_fget@o@: $(srcdir)/mp/mp_fget.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_fopen@o@: $(srcdir)/mp/mp_fopen.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_fput@o@: $(srcdir)/mp/mp_fput.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_fset@o@: $(srcdir)/mp/mp_fset.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_method@o@: $(srcdir)/mp/mp_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_region@o@: $(srcdir)/mp/mp_region.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_register@o@: $(srcdir)/mp/mp_register.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_stat@o@: $(srcdir)/mp/mp_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_sync@o@: $(srcdir)/mp/mp_sync.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mp_trickle@o@: $(srcdir)/mp/mp_trickle.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mt19937db@o@: $(srcdir)/crypto/mersenne/mt19937db.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mut_fcntl@o@: $(srcdir)/mutex/mut_fcntl.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mut_pthread@o@: $(srcdir)/mutex/mut_pthread.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mut_tas@o@: $(srcdir)/mutex/mut_tas.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mut_win32@o@: $(srcdir)/mutex/mut_win32.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 mutex@o@: $(srcdir)/mutex/mutex.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_abs@o@: $(srcdir)/@OSDIR@/os_abs.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_alloc@o@: $(srcdir)/os/os_alloc.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_clock@o@: $(srcdir)/@OSDIR@/os_clock.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_config@o@: $(srcdir)/@OSDIR@/os_config.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_dir@o@: $(srcdir)/@OSDIR@/os_dir.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_errno@o@: $(srcdir)/@OSDIR@/os_errno.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_fid@o@: $(srcdir)/@OSDIR@/os_fid.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_fsync@o@: $(srcdir)/@OSDIR@/os_fsync.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_id@o@: $(srcdir)/os/os_id.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_handle@o@: $(srcdir)/@OSDIR@/os_handle.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_map@o@: $(srcdir)/@OSDIR@/os_map.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_method@o@: $(srcdir)/os/os_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_oflags@o@: $(srcdir)/os/os_oflags.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_open@o@: $(srcdir)/@OSDIR@/os_open.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_region@o@: $(srcdir)/os/os_region.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_rename@o@: $(srcdir)/@OSDIR@/os_rename.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_root@o@: $(srcdir)/os/os_root.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_rpath@o@: $(srcdir)/os/os_rpath.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_rw@o@: $(srcdir)/@OSDIR@/os_rw.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_seek@o@: $(srcdir)/@OSDIR@/os_seek.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_sleep@o@: $(srcdir)/@OSDIR@/os_sleep.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_spin@o@: $(srcdir)/@OSDIR@/os_spin.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_stat@o@: $(srcdir)/@OSDIR@/os_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_tmpdir@o@: $(srcdir)/os/os_tmpdir.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 os_unlink@o@: $(srcdir)/os/os_unlink.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam@o@: $(srcdir)/qam/qam.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_auto@o@: $(srcdir)/qam/qam_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_conv@o@: $(srcdir)/qam/qam_conv.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_files@o@: $(srcdir)/qam/qam_files.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_method@o@: $(srcdir)/qam/qam_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_open@o@: $(srcdir)/qam/qam_open.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_rec@o@: $(srcdir)/qam/qam_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_stat@o@: $(srcdir)/qam/qam_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_stub@o@: $(srcdir)/qam/qam_stub.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_upgrade@o@: $(srcdir)/qam/qam_upgrade.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 qam_verify@o@: $(srcdir)/qam/qam_verify.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 rep_method@o@: $(srcdir)/rep/rep_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 rep_record@o@: $(srcdir)/rep/rep_record.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 rep_region@o@: $(srcdir)/rep/rep_region.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 rep_stub@o@: $(srcdir)/rep/rep_stub.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 rep_util@o@: $(srcdir)/rep/rep_util.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 rijndael-alg-fst@o@: $(srcdir)/crypto/rijndael/rijndael-alg-fst.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 rijndael-api-fst@o@: $(srcdir)/crypto/rijndael/rijndael-api-fst.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 sha1@o@: $(srcdir)/hmac/sha1.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 txn@o@: $(srcdir)/txn/txn.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_auto@o@: $(srcdir)/txn/txn_auto.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_method@o@: $(srcdir)/txn/txn_method.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_rec@o@: $(srcdir)/txn/txn_rec.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_recover@o@: $(srcdir)/txn/txn_recover.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_region@o@: $(srcdir)/txn/txn_region.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_stat@o@: $(srcdir)/txn/txn_stat.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 txn_util@o@: $(srcdir)/txn/txn_util.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 util_cache@o@: $(srcdir)/common/util_cache.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 util_log@o@: $(srcdir)/common/util_log.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 util_sig@o@: $(srcdir)/common/util_sig.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 uts4_cc@o@: $(srcdir)/mutex/uts4_cc.s
 	$(AS) $(ASFLAGS) -o $@ $?
 xa@o@: $(srcdir)/xa/xa.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 xa_db@o@: $(srcdir)/xa/xa_db.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 xa_map@o@: $(srcdir)/xa/xa_map.c
-	 $(CC) $(CFLAGS) $?
+	 $(CC_DRIVER) $(CFLAGS) $?
 
 ##################################################
 # C++ API build rules.
 ##################################################
 cxx_db@o@: $(srcdir)/cxx/cxx_db.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_dbc@o@: $(srcdir)/cxx/cxx_dbc.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_dbt@o@: $(srcdir)/cxx/cxx_dbt.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_env@o@: $(srcdir)/cxx/cxx_env.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_except@o@: $(srcdir)/cxx/cxx_except.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_lock@o@: $(srcdir)/cxx/cxx_lock.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_logc@o@: $(srcdir)/cxx/cxx_logc.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_mpool@o@: $(srcdir)/cxx/cxx_mpool.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_txn@o@: $(srcdir)/cxx/cxx_txn.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 cxx_multi@o@: $(srcdir)/cxx/cxx_multi.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 
 ##################################################
 # Java API build rules.
 ##################################################
 db_java_wrap@o@::$(srcdir)/libdb_java/db_java_wrap.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 
 ##################################################
 # Tcl API build rules.
 ##################################################
 tcl_compat@o@: $(srcdir)/tcl/tcl_compat.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_db@o@: $(srcdir)/tcl/tcl_db.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_db_pkg@o@: $(srcdir)/tcl/tcl_db_pkg.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_dbcursor@o@: $(srcdir)/tcl/tcl_dbcursor.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_env@o@: $(srcdir)/tcl/tcl_env.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_internal@o@: $(srcdir)/tcl/tcl_internal.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_lock@o@: $(srcdir)/tcl/tcl_lock.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_log@o@: $(srcdir)/tcl/tcl_log.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_mp@o@: $(srcdir)/tcl/tcl_mp.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_rep@o@: $(srcdir)/tcl/tcl_rep.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_txn@o@: $(srcdir)/tcl/tcl_txn.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 tcl_util@o@: $(srcdir)/tcl/tcl_util.c
-	$(CC) $(CFLAGS) $(TCFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $(TCFLAGS) $?
 
 ##################################################
 # RPC build rules.
 ##################################################
 # RPC client files
 client@o@: $(srcdir)/rpc_client/client.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_server_clnt@o@: $(srcdir)/rpc_client/db_server_clnt.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 gen_client@o@: $(srcdir)/rpc_client/gen_client.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 gen_client_ret@o@: $(srcdir)/rpc_client/gen_client_ret.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 
 # RPC server files
 db_server_proc@o@: $(srcdir)/rpc_server/c/db_server_proc.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_server_svc@o@: $(srcdir)/rpc_server/c/db_server_svc.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_server_util@o@: $(srcdir)/rpc_server/c/db_server_util.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_server_xdr@o@: $(srcdir)/rpc_server/c/db_server_xdr.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 gen_db_server@o@: $(srcdir)/rpc_server/c/gen_db_server.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_server_cxxproc@o@: $(srcdir)/rpc_server/cxx/db_server_cxxproc.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 db_server_cxxutil@o@: $(srcdir)/rpc_server/cxx/db_server_cxxutil.cpp
-	$(CXX) $(CXXFLAGS) $?
+	$(CXX_DRIVER) $(CXXFLAGS) $?
 
 ##################################################
 # Utility build rules.
 ##################################################
 db_archive@o@: $(srcdir)/db_archive/db_archive.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_checkpoint@o@: $(srcdir)/db_checkpoint/db_checkpoint.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_deadlock@o@: $(srcdir)/db_deadlock/db_deadlock.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_dump@o@: $(srcdir)/db_dump/db_dump.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_dump185@o@: $(srcdir)/db_dump185/db_dump185.c
-	$(CC) $(DB185INC) $?
+	$(CC_DRIVER) $(DB185INC) $?
 db_load@o@: $(srcdir)/db_load/db_load.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_printlog@o@: $(srcdir)/db_printlog/db_printlog.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_recover@o@: $(srcdir)/db_recover/db_recover.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_stat@o@: $(srcdir)/db_stat/db_stat.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_upgrade@o@: $(srcdir)/db_upgrade/db_upgrade.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 db_verify@o@: $(srcdir)/db_verify/db_verify.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 
 ##################################################
 # C library replacement files.
 ##################################################
 getcwd@o@: $(srcdir)/clib/getcwd.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 getopt@o@: $(srcdir)/clib/getopt.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 memcmp@o@: $(srcdir)/clib/memcmp.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 memcpy@o@: $(srcdir)/clib/memmove.c
-	$(CC) -DMEMCOPY $(CFLAGS) $? -o $@
+	$(CC_DRIVER) -DMEMCOPY $(CFLAGS) $? -o $@
 memmove@o@: $(srcdir)/clib/memmove.c
-	$(CC) -DMEMMOVE $(CFLAGS) $?
+	$(CC_DRIVER) -DMEMMOVE $(CFLAGS) $?
 raise@o@: $(srcdir)/clib/raise.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 strcasecmp@o@: $(srcdir)/clib/strcasecmp.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 strdup@o@: $(srcdir)/clib/strdup.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 snprintf@o@: $(srcdir)/clib/snprintf.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 strerror@o@: $(srcdir)/clib/strerror.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?
 vsnprintf@o@: $(srcdir)/clib/vsnprintf.c
-	$(CC) $(CFLAGS) $?
+	$(CC_DRIVER) $(CFLAGS) $?