From bcc6b4b0acc70f486633f563cacdd6df9f5e65c0 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sun, 19 Aug 2001 16:18:30 +0000
Subject: [PATCH] - configure.in: actually save CXXFLAGS instead of CFLAGS in
 the code to   detect whether the compiler supports -fno-merge-constants or
 not - Makefile.in: make sure to link gencpu with g++ since it contains
 objects   compiled from C++ code. Fix build problems with gcc 3.0.1

---
 BasiliskII/src/Unix/Makefile.in  | 2 +-
 BasiliskII/src/Unix/configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
index 2bf7385f..2f7bc699 100644
--- a/BasiliskII/src/Unix/Makefile.in
+++ b/BasiliskII/src/Unix/Makefile.in
@@ -107,7 +107,7 @@ $(OBJ_DIR)/cpuopti: $(OBJ_DIR)/cpuopti.o
 $(OBJ_DIR)/build68k: $(OBJ_DIR)/build68k.o
 	$(CC) $(LDFLAGS) -o $(OBJ_DIR)/build68k $(OBJ_DIR)/build68k.o
 $(OBJ_DIR)/gencpu: $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
-	$(CC) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
+	$(CXX) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
 cpudefs.cpp: $(OBJ_DIR)/build68k ../uae_cpu/table68k
 	$(OBJ_DIR)/build68k <../uae_cpu/table68k >cpudefs.cpp
 cpustbl.cpp: cpuemu.cpp
diff --git a/BasiliskII/src/Unix/configure.in b/BasiliskII/src/Unix/configure.in
index 638006f3..5237842b 100644
--- a/BasiliskII/src/Unix/configure.in
+++ b/BasiliskII/src/Unix/configure.in
@@ -672,7 +672,7 @@ dnl Mandrake: gcc-2.96 >= 0.59mdk, gcc-3.0.1 >= 0.1mdk
 dnl Red Hat : gcc-2.96 >= 89, gcc-3.0 >= 1
 if [[ "x$HAVE_GCC27" = "xyes" ]]; then
   SAVED_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CFLAGS -fno-merge-constants"
+  CXXFLAGS="$CXXFLAGS -fno-merge-constants"
   AC_CACHE_CHECK([whether GCC supports constants merging], ac_cv_gcc_constants_merging, [
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS