From 76e785578b4536f8bc586d1402c09fc05c1492bd Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Fri, 17 Aug 2012 19:38:47 +0100
Subject: [PATCH] Add back in missing -lpthread. Fixes #1127.

---
 Makefile              | 2 +-
 support/configure.inc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 96894be7..c0bbcbe6 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ CFLAGS  += -Wmissing-prototypes -fms-extensions
 CFLAGS  += -g -funsigned-char -O2 
 CFLAGS  += -D_FILE_OFFSET_BITS=64
 CFLAGS  += -I${BUILDDIR} -I${CURDIR}/src -I${CURDIR}
-LDFLAGS += -lrt -ldl
+LDFLAGS += -lrt -ldl -lpthread
 
 #
 # Binaries/Scripts
diff --git a/support/configure.inc b/support/configure.inc
index 308f4701..7a9c5f65 100644
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -330,6 +330,7 @@ function write_config
 ROOTDIR  ?= ${ROOTDIR}
 BUILDDIR ?= ${ROOTDIR}/build.${PLATFORM}
 OSENV    ?= ${OSENV}
+ARCH      = ${ARCH}
 CFLAGS   += ${CFLAGS}
 LDFLAGS  += ${LDFLAGS}
 EOF