Merge branch 'conduit-free'

diff --git a/README.md b/README.md
index 47fbba57142bce42e22236a0ff93c0ca63b7eacb..32b144d75dffacd7b4875a3faf8db8b520c99f66 100644 (file)
--- a/README.md
+++ b/README.md
@@ -82,10 +82,9 @@ your resolvers.
 
 ## Status
 
-Alpha. It is largely untested, and there are loose ends in the
-functionality. For example, `delegate` does not work yet, version in the
-`SOA` record is bogus. Some of the the problems are due to incomplete
-and/or imprecise
+Alpha. It is insufficiently tested, and there are loose ends in the
+functionality. For example, version in the `SOA` record is bogus.
+Some of the the problems are due to incomplete and/or imprecise
 [definition of the domain data format](https://wiki.namecoin.info/index.php?title=Domain_Name_Specification)
 on the wiki. That said, I am using it to access some of the `.bit` websites
 and did not notice anomalies so far.

diff --git a/build b/build
index a2eb755c07744f713ab5983a1166e8107def619a..319e038d4041bdf6992342cf6332bde4b05c6e1d 100755 (executable)
--- a/build
+++ b/build
@@ -1,9 +1,13 @@
 #!/bin/sh
 
 file="pdns-pipe-nmc"
-sfx="`uname -m`.`date +%Y-%m-%d`.git-`git rev-parse --verify HEAD | cut -c 1-7`"
+sfx="linux-glibc6.`uname -m`.`date +%Y-%m-%d`.git-`git rev-parse --verify HEAD | cut -c 1-7`"
 echo "Making $file.$sfx"
 
+# tried this:
+#ghc --make -static -optc-static -optl-shared-libgcc -optl-static -optl-pthread
+# but cannot make it "only glibc is shared". And with static glibc,
+# getaddrinfo does not work on systems with different glibc.
 ghc --make "$file"
 case $? in
 0) ;;