X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tools-for-build%2Fgrovel-features.sh;h=935c099f7d90fcd39881ab090df95dd58f2c6e2f;hb=7c7e6276719b8d40fddec2070cad81064a25c8ed;hp=0ba0760820cd216c2dabd53db61088244c0ac2c0;hpb=888637f090872d0e00a12be331d6a637d4d99dd3;p=sbcl.git

diff --git a/tools-for-build/grovel-features.sh b/tools-for-build/grovel-features.sh
index 0ba0760..935c099 100644
--- a/tools-for-build/grovel-features.sh
+++ b/tools-for-build/grovel-features.sh
@@ -1,20 +1,15 @@
 # Automated platform feature testing 
-
-DIR=tools-for-build
+cd ./tools-for-build > /dev/null
 
 # FIXME: Use this to test for dlopen presence and hence
 # load-shared-object buildability
 
-# $1 feature
-# $2 additional flags
-#
 # Assumes the presence of $1-test.c, which when built and
 # run should return with 104 if the feature is present.
-#
 featurep() {
-    bin="$DIR/$1-test"
+    bin="$1-test"
     rm -f $bin
-    cc $DIR/$1-test.c $2 -o $bin > /dev/null 2>&1 && $bin > /dev/null 2>&1
+    $GNUMAKE $bin -I ../src/runtime > /dev/null 2>&1 && ./$bin > /dev/null 2>&1
     if [ "$?" = 104 ]
     then
 	printf " :$1"
@@ -22,4 +17,8 @@ featurep() {
     rm -f $bin
 }
 
-featurep os-provides-dladdr -ldl
+# KLUDGE: ppc/darwin dlopen is special cased in make-config.sh, as
+# we fake it with a shim.
+featurep os-provides-dlopen
+
+featurep os-provides-dladdr