diff -Naur a/Makefile.org b/Makefile.org
--- a/Makefile.org	2015-04-17 16:31:06.448921145 -0700
+++ b/Makefile.org	2015-04-20 13:48:08.654093777 -0700
@@ -340,7 +340,10 @@
 		libs="$$libs -l$$i"; \
 	done
 
-build-shared: do_$(SHLIB_TARGET) link-shared
+# The link target in Makefile.shared will create the symlink for us, so no need
+# to call link-shared directly. Doing so will cause races with two processes
+# trying to symlink the lib.
+build-shared: do_$(SHLIB_TARGET)
 
 do_$(SHLIB_TARGET):
 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \