Revert "Add flags to build prometheus statically"

This reverts commit 0e9e3e0. Not only do we know this to produce problematic artifacts, it refuses to build on Mac OS X. TMPDIR=/tmp GOROOT=/Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/go GOPATH=/Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/gopath /Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/go/bin/go build -o prometheus -ldflags " -X main.buildVersion c7052ed -X main.buildBranch refactor/storage/modify-append-signature -X main.buildUser mattproud@Berlin.local -X main.buildDate 20130815-11:15:49 -X main.goVersion 1.1 -X main.leveldbVersion 1.12.0 -X main.protobufVersion 2.5.0 -X main.snappyVersion 1.1.0 -linkmode external -extldflags '-lstdc++ -lpthread -static /Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/lib/libleveldb.a /Users/mattproud/Development/go/src/github.com/prometheus/prometheus/.build/root/lib/libsnappy.a'" . # _/Users/mattproud/Development/go/src/github.com/prometheus/prometheus ld: library not found for -lcrt0.o Change-Id: I4f42161aebfd35a6f09cd7f984b78cc4498774aa
voilet · Aug 15, 2013 · 9c8112a · 9c8112a
1 parent c7052ed
commit 9c8112a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@
 *.pyc
 *.rej
 *.so
-*.tar.gz
 *~
 .*.swp
 .DS_Store

diff --git a/Makefile b/Makefile
@@ -34,11 +34,6 @@ build: config dependencies model preparation tools web
 docker: build
 	docker build -t prometheus:$(REV) .
 
-tarball: build prometheus-$(REV).tar.gz
-
-prometheus-$(REV).tar.gz:
-	tar -czf prometheus-$(REV).tar.gz prometheus
-
 $(BUILD_PATH)/cache/$(GOPKG):
 	curl -o $@ http://go.googlecode.com/files/$(GOPKG)
 

diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE
@@ -89,9 +89,6 @@ BUILDFLAGS := -ldflags \
 		-X main.goVersion $(GO_VERSION)\
 		-X main.leveldbVersion $(LEVELDB_VERSION)\
 		-X main.protobufVersion $(PROTOCOL_BUFFERS_VERSION)\
-		-X main.snappyVersion $(SNAPPY_VERSION)\
-		-linkmode external\
-		-extldflags '-lstdc++ -lpthread -static\
-		$(PREFIX)/lib/libleveldb.a $(PREFIX)/lib/libsnappy.a'"
+		-X main.snappyVersion $(SNAPPY_VERSION)"
 
 PROTOC := $(LOCAL_BINARIES)/protoc
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     *.pyc
     *.rej
     *.so
-    *.tar.gz
     *~
     .*.swp
     .DS_Store
@@ Expand Down @@