From 4f0f8f9552dc1240f375e4dbd59ebe38c46e28cb Mon Sep 17 00:00:00 2001
From: "Matt T. Proud" <matt.proud@gmail.com>
Date: Sat, 1 Dec 2012 13:30:23 +0100
Subject: [PATCH] Take into account nuances for Mac OS X.  :-(

---
 Makefile        | 2 +-
 Makefile.TRAVIS | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2af3dd6a6..5939e9bcb 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ test: build
 build:
 	$(MAKE) -C model
 	go build ./...
-	go build .
 
 clean:
 	rm -rf $(TEST_ARTIFACTS)
@@ -40,3 +39,4 @@ documentation: search_index
 	godoc -http=:6060 -index -index_files='search_index'
 
 .PHONY: build clean format test
+
diff --git a/Makefile.TRAVIS b/Makefile.TRAVIS
index 01cfc65ed..e353ab73e 100644
--- a/Makefile.TRAVIS
+++ b/Makefile.TRAVIS
@@ -25,8 +25,9 @@ export CXXFLAGS := $(CXXFLAGS) -I$(OVERLAY_ROOT)/include
 export CPPFLAGS := $(CPPFLAGS) -I$(OVERLAY_ROOT)/include
 export LDFLAGS := $(LDFLAGS) -L$(OVERLAY_ROOT)/lib
 export CGO_CFLAGS := $(CFLAGS)
+export CGO_LDFLAGS := $(LDFLAGS)
 
-GO_GET := go get -v -x
+GO_GET := go get -u -v -x
 APT_GET_INSTALL := sudo apt-get install -y
 WGET := wget -c
 
@@ -105,7 +106,9 @@ leveldb-stamp: cc rsync leveldb-$(LEVELDB_VERSION).tar.gz overlay
 	tar xzvf leveldb-$(LEVELDB_VERSION).tar.gz
 	$(MAKE) -C leveldb-$(LEVELDB_VERSION)
 	rsync -av "leveldb-$(LEVELDB_VERSION)/include/" "$(OVERLAY_ROOT)/include/"
-	rsync -av "leveldb-$(LEVELDB_VERSION)/"*.so* "$(OVERLAY_ROOT)/lib/"
+	-rsync -av "leveldb-$(LEVELDB_VERSION)/"*.*so* "$(OVERLAY_ROOT)/lib/"
+	-rsync -av "leveldb-$(LEVELDB_VERSION)/"*.*dylib* "$(OVERLAY_ROOT)/lib/"
+	rsync -av "leveldb-$(LEVELDB_VERSION)/"*.a "$(OVERLAY_ROOT)/lib/"
 	touch $@
 
 leveldb-$(LEVELDB_VERSION).tar.gz: wget
@@ -153,3 +156,4 @@ clean:
 
 
 .PHONY: all bison build-dependencies cc clean go goprotobuf gorest leveldb levigo mercurial overlay preparation protoc rsync source test wget
+