1.0.39.3: support building on darwin x86 and x86-64 without the dlshim

[sbcl.git] / tools-for-build / grovel-headers.c

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index 6c42bd1..2058cad 100644 (file)
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -18,6 +18,8 @@
  * more information.
  */
 
+#include "genesis/config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -34,12 +36,13 @@
   #include <sys/wait.h>
   #include <sys/ioctl.h>
   #include <sys/termios.h>
-  #ifdef __APPLE_CC__
-    #include "../src/runtime/darwin-dlshim.h"
+  #ifdef LISP_FEATURE_DARWIN
     #include "../src/runtime/darwin-langinfo.h"
+  #endif
+  #ifdef LISP_FEATURE_DLSHIM
+    #include "../src/runtime/darwin-dlshim.h"
   #else
     #include <dlfcn.h>
-    #include <langinfo.h>
   #endif
 #endif
 
@@ -49,8 +52,6 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "genesis/config.h"
-
 #ifdef LISP_FEATURE_HPUX
 #include <sys/bsdtty.h> /* for TIOCGPGRP */
 #endif