From 1828ff56979c292e962cae6c8dc38da6b651832e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 25 Nov 2020 20:21:57 -0700
Subject: [PATCH] bc: add CPPFLAGS to libffi's test for X32

---
 racket/src/bc/foreign/README                | 2 ++
 racket/src/bc/foreign/libffi/configure.host | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/racket/src/bc/foreign/README b/racket/src/bc/foreign/README
index 07035de1b3..1bd89e914a 100644
--- a/racket/src/bc/foreign/README
+++ b/racket/src/bc/foreign/README
@@ -5,3 +5,5 @@ Changes to the source in this copy:
 
  * Commented out `__attribute__((deprecated))` for `ffi_java_...` to
    avoid warnings when compiling libffi itself.
+
+ * Added $CPPFLAGS to use of $CC in "configure.host"
diff --git a/racket/src/bc/foreign/libffi/configure.host b/racket/src/bc/foreign/libffi/configure.host
index 9a72cda87e..2b66a819b4 100644
--- a/racket/src/bc/foreign/libffi/configure.host
+++ b/racket/src/bc/foreign/libffi/configure.host
@@ -115,7 +115,7 @@ case "${host}" in
 	      ;;
 	    *)
 	      echo 'int foo (void) { return __x86_64__; }' > conftest.c
-	      if $CC $CFLAGS -Werror -S conftest.c -o conftest.s > /dev/null 2>&1; then
+	      if $CC $CFLAGS $CPPFLAGS -Werror -S conftest.c -o conftest.s > /dev/null 2>&1; then
 		TARGET_X32=yes
 		TARGET=X86_64
 	      else