From 2cfa40093686988a424f39aa27f42cf1c193a651 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 29 Jul 2010 07:12:51 -0600
Subject: [PATCH] adjust configure with --enable-sdk to force gcc 4.0 instead
 of 4.2  Merge to 5.0.1 (cherry picked from commit
 79b782edad1585495278d690a7c654ab8947ec10)

---
 src/configure           | 16 ++++++++++++++++
 src/racket/configure.ac | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/configure b/src/configure
index 0c7027b6b1..292be2cb1c 100755
--- a/src/configure
+++ b/src/configure
@@ -5963,6 +5963,22 @@ case $OS in
     if test "${enable_sdk}" != "" ; then
       PREFLAGS="$PREFLAGS -isysroot ${enable_sdk} -mmacosx-version-min=10.4 -DEXTRA_EXCEPTION_STUBS"
       LDFLAGS="$LDFLAGS -isysroot ${enable_sdk} -mmacosx-version-min=10.4"
+      if test "${CC}" = "gcc" ; then
+        CC=gcc-4.0
+      fi
+      if test "${CXX}" = "g++" ; then
+        CXX=g++-4.0
+      fi
+      if test "${CPP}" = "gcc -E" ; then
+        CPP="gcc-4.0 -E"
+      fi
+      if test "${CXXCPP}" = "g++ -E" ; then
+        CXXCPP="g++-4.0 -E"
+      fi
+      if test "${LD}" = "gcc" ; then
+        LD=gcc-4.0
+      fi
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
     fi
 
     case `$UNAME -m` in
diff --git a/src/racket/configure.ac b/src/racket/configure.ac
index fa84aedf6b..8f3be24ad4 100644
--- a/src/racket/configure.ac
+++ b/src/racket/configure.ac
@@ -660,6 +660,22 @@ case $OS in
     if test "${enable_sdk}" != "" ; then 
       PREFLAGS="$PREFLAGS -isysroot ${enable_sdk} -mmacosx-version-min=10.4 -DEXTRA_EXCEPTION_STUBS"
       LDFLAGS="$LDFLAGS -isysroot ${enable_sdk} -mmacosx-version-min=10.4"
+      if test "${CC}" = "gcc" ; then
+        CC=gcc-4.0
+      fi
+      if test "${CXX}" = "g++" ; then
+        CXX=g++-4.0
+      fi
+      if test "${CPP}" = "gcc -E" ; then
+        CPP="gcc-4.0 -E"
+      fi
+      if test "${CXXCPP}" = "g++ -E" ; then
+        CXXCPP="g++-4.0 -E"
+      fi
+      if test "${LD}" = "gcc" ; then
+        LD=gcc-4.0
+      fi
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
     fi
     
     case `$UNAME -m` in