diff --git a/racket/src/configure b/racket/src/configure
index 7c27694155..1766c229f8 100755
--- a/racket/src/configure
+++ b/racket/src/configure
@@ -4561,11 +4561,15 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
       fi
       if test "${CPP}" = "gcc -E" ; then
         CPP="gcc-4.0 -E"
+        need_cpp_in_extras=yes
       fi
       if test "${LD}" = "gcc" ; then
         LD=gcc-4.0
+        need_ld_in_extras=yes
       fi
-      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
       need_cc_in_extras=yes
       if test "$ORIG_CC_FOR_BUILD" = "" ; then
         CC_FOR_BUILD="$CC"
@@ -4575,7 +4579,9 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
     if test "${enable_sdk6}" != "" ; then
       PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
       LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
-      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
     fi
 
     case "$host_cpu" in
@@ -4609,6 +4615,12 @@ $as_echo "#define HAVE_STDINT_H 1" >>confdefs.h
     if test "${need_cc_in_extras}" = "yes" ; then
       SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
     fi
+    if test "${need_cpp_in_extras}" = "yes" ; then
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPP="'"'"${CPP}"'"'
+    fi
+    if test "${need_ld_in_extras}" = "yes" ; then
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LD="'"'"${LD}"'"'
+    fi
 
     if test "${enable_quartz}" = "yes" ; then
       WXVARIANT="wx_mac"
diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac
index b6c58f6e23..1009dc8843 100644
--- a/racket/src/racket/configure.ac
+++ b/racket/src/racket/configure.ac
@@ -713,11 +713,15 @@ case "$host_os" in
       fi
       if test "${CPP}" = "gcc -E" ; then
         CPP="gcc-4.0 -E"
+        need_cpp_in_extras=yes
       fi
       if test "${LD}" = "gcc" ; then
         LD=gcc-4.0
+        need_ld_in_extras=yes
       fi
-      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
       need_cc_in_extras=yes
       if test "$ORIG_CC_FOR_BUILD" = "" ; then
         CC_FOR_BUILD="$CC"
@@ -727,7 +731,9 @@ case "$host_os" in
     if test "${enable_sdk6}" != "" ; then 
       PREFLAGS="$PREFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
       LDFLAGS="$LDFLAGS -isysroot ${enable_sdk6} -mmacosx-version-min=10.6"
-      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPPFLAGS="'"'"${PREFLAGS}"'"'
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LDFLAGS="'"'"${LDFLAGS}"'"'
     fi
     
     case "$host_cpu" in
@@ -761,6 +767,12 @@ case "$host_os" in
     if test "${need_cc_in_extras}" = "yes" ; then
       SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
     fi
+    if test "${need_cpp_in_extras}" = "yes" ; then
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CPP="'"'"${CPP}"'"'
+    fi
+    if test "${need_ld_in_extras}" = "yes" ; then
+      SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} LD="'"'"${LD}"'"'
+    fi
 
     if test "${enable_quartz}" = "yes" ; then
       WXVARIANT="wx_mac"