Browse Source

Revert "Add flags to build prometheus statically"

This reverts commit 0e9e3e068d.

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
pull/362/merge
Matt T. Proud 11 years ago
parent
commit
9c8112a053
  1. 1
      .gitignore
  2. 5
      Makefile
  3. 5
      Makefile.INCLUDE

1
.gitignore vendored

@ -9,7 +9,6 @@
*.pyc *.pyc
*.rej *.rej
*.so *.so
*.tar.gz
*~ *~
.*.swp .*.swp
.DS_Store .DS_Store

5
Makefile

@ -34,11 +34,6 @@ build: config dependencies model preparation tools web
docker: build docker: build
docker build -t prometheus:$(REV) . 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): $(BUILD_PATH)/cache/$(GOPKG):
curl -o $@ http://go.googlecode.com/files/$(GOPKG) curl -o $@ http://go.googlecode.com/files/$(GOPKG)

5
Makefile.INCLUDE

@ -89,9 +89,6 @@ BUILDFLAGS := -ldflags \
-X main.goVersion $(GO_VERSION)\ -X main.goVersion $(GO_VERSION)\
-X main.leveldbVersion $(LEVELDB_VERSION)\ -X main.leveldbVersion $(LEVELDB_VERSION)\
-X main.protobufVersion $(PROTOCOL_BUFFERS_VERSION)\ -X main.protobufVersion $(PROTOCOL_BUFFERS_VERSION)\
-X main.snappyVersion $(SNAPPY_VERSION)\ -X main.snappyVersion $(SNAPPY_VERSION)"
-linkmode external\
-extldflags '-lstdc++ -lpthread -static\
$(PREFIX)/lib/libleveldb.a $(PREFIX)/lib/libsnappy.a'"
PROTOC := $(LOCAL_BINARIES)/protoc PROTOC := $(LOCAL_BINARIES)/protoc

Loading…
Cancel
Save