From b4f52e75fdd10db6148b868920a76934f8d42cb3 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Sun, 20 Nov 2016 23:51:28 -0800
Subject: configure: move Darwin check into Makefile.

* Makefile (conftest.darwin): New phony target.

* configure: Always do Darwin check via make conftest.darwin.
---
 Makefile  |  6 ++++++
 configure | 26 +++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 9298d6f1..1939ff55 100644
--- a/Makefile
+++ b/Makefile
@@ -469,6 +469,12 @@ conftest.yacc:
 conftest.ccver:
 	$(V)$(TXR_CC) --version
 
+.PHONY: conftest.darwin
+conftest.darwin:
+	$(V)if echo | $(CC) -dM -E - | grep -s __APPLE__ >  /dev/null 2>&1 ; then \
+	  echo yes ; \
+	fi
+
 .PHONY: conftest.clean
 conftest.clean:
 	$(V)rm -f conftest$(EXE) conftest.[co] \
diff --git a/configure b/configure
index 7770872d..cb9f595d 100755
--- a/configure
+++ b/configure
@@ -887,21 +887,17 @@ fi
 # Detect Apple environment. We need _DARWIN_C_SOURCE.
 #
 
-case "$ccname" in
-  *gcc )
-     printf "Checking for Apple environment ... "
-     if echo | gcc -dM -E - | grep -s __APPLE__ > /dev/null 2>&1 ; then
-       printf "yes\n"
-       need_darwin_c_source=y
-       lang_flags="$lang_flags -D_DARWIN_C_SOURCE"
-       printf "Regenerating %s ..." $config_make
-       gen_config_make
-       printf "done\n"
-     else
-       printf "no\n"
-     fi
-     ;;
-esac
+printf "Checking for Apple environment ... "
+if [ "$(make conftest.darwin)" = "yes" ] ; then
+  printf "yes\n"
+  need_darwin_c_source=y
+  lang_flags="$lang_flags -D_DARWIN_C_SOURCE"
+  printf "Regenerating %s ..." $config_make
+  gen_config_make
+  printf "done\n"
+else
+  printf "no\n"
+fi
 
 #
 # Detect stupid FreeBSD problem: no defined way to reveal
-- 
cgit v1.2.3