From 9909fe2d1edc70df30e4824d030d0ff965e1e54b Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Fri, 9 May 2008 15:08:09 +0000 Subject: [PATCH] use gcc-4.2 on debian4 git-svn-id: file:///svn/tokudb@3891 c7de825b-a66e-492c-adef-691d508d4ae1 --- db-benchmark-test-cxx/db-benchmark-test.cpp | 4 ++-- src/Makefile | 4 ++-- src/lock_tree/Makefile | 4 ++-- src/lock_tree/tests/Makefile | 8 ++++---- src/range_tree/tests/Makefile | 6 +++--- src/tests/Makefile | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/db-benchmark-test-cxx/db-benchmark-test.cpp b/db-benchmark-test-cxx/db-benchmark-test.cpp index eb1bc55e301..3667b1dd9da 100644 --- a/db-benchmark-test-cxx/db-benchmark-test.cpp +++ b/db-benchmark-test-cxx/db-benchmark-test.cpp @@ -28,8 +28,8 @@ long long cachesize = 128*1024*1024; #define STRINGIFY2(s) #s #define STRINGIFY(s) STRINGIFY2(s) -char *dbdir = "./bench." STRINGIFY(DIRSUF) "/"; /* DIRSUF is passed in as a -D argument to the compiler. */; -char *dbfilename = "bench.db"; +char dbdir[] = "./bench." STRINGIFY(DIRSUF) "/"; /* DIRSUF is passed in as a -D argument to the compiler. */; +char dbfilename[] = "bench.db"; char *dbname; DbEnv *dbenv; diff --git a/src/Makefile b/src/Makefile index 62e862c6085..d772489b4bf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -82,7 +82,7 @@ RANGETREE_BINS = range_tree/rangetree.o range_tree/tokuredblack.o LOCKTREE_BINS = lock_tree/locktree.o lock_tree/rth.o lock_tree/lth.o lock_tree/idlth.o lock_tree/db_id.o $(RANGETREE_BINS) $(LIBRARY): $(DBBINS) | buildlocktrees - cc $(CPPFLAGS) $^ $(LOCKTREE_BINS) $(SHARED) -o $@ $(CFLAGS) -lz $(RPATHNAME) + $(CC) $(CPPFLAGS) $^ $(LOCKTREE_BINS) $(SHARED) -o $@ $(CFLAGS) -lz $(RPATHNAME) $(LIBNAME).a: $(DBBINS) | buildlocktrees $(AR) rv $@ $^ $(LOCKTREE_BINS) @@ -90,7 +90,7 @@ $(LIBNAME).a: $(DBBINS) | buildlocktrees $(LIBNAME).a(ydb.o): ydb.o $(TLIBRARY): $(TDBBINS) | buildlocktrees - cc $(CPPFLAGS) $^ $(LOCKTREE_BINS) $(SHARED) -o $@ $(CFLAGS) -lz $(RPATHNAME) + $(CC) $(CPPFLAGS) $^ $(LOCKTREE_BINS) $(SHARED) -o $@ $(CFLAGS) -lz $(RPATHNAME) $(TLIBNAME).a: $(TDBBINS) | buildlocktrees $(AR) rv $@ $^ $(LOCKTREE_BINS) diff --git a/src/lock_tree/Makefile b/src/lock_tree/Makefile index 8bff9705664..d9e03694a6f 100644 --- a/src/lock_tree/Makefile +++ b/src/lock_tree/Makefile @@ -50,10 +50,10 @@ locktree.o: $(LT_TLOG) cp $< $@ locktree_global_readset.o: locktree.c locktree.h - cc $(CFLAGS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ locktree_no_global_readset.o: locktree.c locktree.h - cc $(CFLAGS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ -DTOKU_RT_NOOVERLAPS + $(CC) $(CFLAGS) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ -DTOKU_RT_NOOVERLAPS rth.o: rth.c rth.h diff --git a/src/lock_tree/tests/Makefile b/src/lock_tree/tests/Makefile index d3925d959c1..3ae123f8b61 100644 --- a/src/lock_tree/tests/Makefile +++ b/src/lock_tree/tests/Makefile @@ -118,13 +118,13 @@ foo: echo ../locktree.h test.h $(LT_LINEAR) %.lin: %.c ../locktree.h test.h $(LT_LINEAR) - cc -DDIR=\"dir.$<.lin\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_LINEAR) $(NEWBRT_BINS) -lz + $(CC) -DDIR=\"dir.$<.lin\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_LINEAR) $(NEWBRT_BINS) -lz %.tlin: %.c ../locktree.h test.h $(LT_TLINEAR) - cc -DDIR=\"dir.$<.tlin\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_TLINEAR) $(NEWBRT_BINS) -DTOKU_RT_NOOVERLAPS -lz + $(CC) -DDIR=\"dir.$<.tlin\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_TLINEAR) $(NEWBRT_BINS) -DTOKU_RT_NOOVERLAPS -lz %.tlog: %.c ../locktree.h test.h $(LT_TLOG) - cc -DDIR=\"dir.$<.tlog\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_TLOG) $(NEWBRT_BINS) -DTOKU_RT_NOOVERLAPS -lz + $(CC) -DDIR=\"dir.$<.tlog\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_TLOG) $(NEWBRT_BINS) -DTOKU_RT_NOOVERLAPS -lz %.log: %.c ../locktree.h test.h $(LT_LOG) - cc -DDIR=\"dir.$<.log\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_LOG) $(NEWBRT_BINS) -lz + $(CC) -DDIR=\"dir.$<.log\" $(CPPFLAGS) $(CFLAGS) $< -o $@ $(LT_LOG) $(NEWBRT_BINS) -lz clean: rm -f $(ALL_TESTS) *.o *.gcno *.gcda *.gcov diff --git a/src/range_tree/tests/Makefile b/src/range_tree/tests/Makefile index 06d584c51b0..1d4e8ba7d60 100644 --- a/src/range_tree/tests/Makefile +++ b/src/range_tree/tests/Makefile @@ -93,11 +93,11 @@ LOG_BINS = ../log.o HEADERS=../rangetree.h ../rangetree-internal.h test.h %.lin: %.c $(HEADERS) $(LINEAR_BINS) - cc -DDIR=\"dir.$<.lin\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINEAR_BINS) + $(CC) -DDIR=\"dir.$<.lin\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINEAR_BINS) %.tlog: %.c $(HEADERS) $(TLOG_BINS) - cc -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(TLOG_BINS) -DTOKU_RT_NOOVERLAPS + $(CC) -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(TLOG_BINS) -DTOKU_RT_NOOVERLAPS %.log: %.c $(HEADERS) $(LOG_BINS) - cc -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LOG_BINS) + $(CC) -DDIR=\"dir.$<.log\" $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LOG_BINS) clean: rm -f $(ALL_TESTS) *.o *.gcno *.gcda *.gcov diff --git a/src/tests/Makefile b/src/tests/Makefile index 096d3ad1b25..ac8ee4af340 100644 --- a/src/tests/Makefile +++ b/src/tests/Makefile @@ -139,11 +139,11 @@ libs: cd ..;make %.bdb: %.c - $(UNSETTOKUENV) cc -DENVDIR=\"dir.$<.bdb\" $(BDB_CPPFLAGS) -DUSE_BDB -DIS_TDB=0 $(CFLAGS) $< $(BDB_LDFLAGS) -ldb -o $@ + $(UNSETTOKUENV) $(CC) -DENVDIR=\"dir.$<.bdb\" $(BDB_CPPFLAGS) -DUSE_BDB -DIS_TDB=0 $(CFLAGS) $< $(BDB_LDFLAGS) -ldb -o $@ %.tdb: %.c - $(SETTOKUENV) cc -DENVDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(TDB_CPPFLAGS) $(TDB_LOADLIBES) $< -o $@ + $(SETTOKUENV) $(CC) -DENVDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(TDB_CPPFLAGS) $(TDB_LOADLIBES) $< -o $@ %.tdbt: %.c - $(SETTOKUENV) cc -DENVDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(TDB_CPPFLAGS) $(TDB_TRACELOADLIBES) $< -o $@ + $(SETTOKUENV) $(CC) -DENVDIR=\"dir.$<.tdb\" -DUSE_TDB -DIS_TDB=1 $(CFLAGS) $(TDB_CPPFLAGS) $(TDB_TRACELOADLIBES) $< -o $@ .PHONY: %.recover TLRECOVER = 2 3 4 5 6 7 8 9 10