From 1a6b9ccfc8e72e716dd109dcdc96ff7321dce047 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sat, 22 Nov 2014 11:14:10 -0800 Subject: [PATCH] Fixing isal compile from root, workaround for https://code.google.com/p/go/issues/detail?id=7891 --- Makefile | 11 +++++++---- erasure/decode.go | 2 +- erasure/encode.go | 2 +- isal | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) create mode 120000 isal diff --git a/Makefile b/Makefile index b53ff5732..17da0e147 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,16 @@ all: test install -test: - mkdir -p cover +build-erasure: + cd erasure && make + + +test: build-erasure godep go test -race -coverprofile=cover/cover.out github.com/minio-io/minio godep go test -race github.com/minio-io/minio/cmd/minio -install: - godep go install -race github.com/minio-io/minio/cmd/minio +install: build-erasure + godep go install github.com/minio-io/minio/cmd/minio save: godep save ./... diff --git a/erasure/decode.go b/erasure/decode.go index 9b152180b..f9fb6dd82 100644 --- a/erasure/decode.go +++ b/erasure/decode.go @@ -20,7 +20,7 @@ package erasure // #cgo CPPFLAGS: -Iisal/include -// #cgo LDFLAGS: isal/isa-l.so +// #cgo LDFLAGS: isal/isa-l.a // #include // #include // #include diff --git a/erasure/encode.go b/erasure/encode.go index bc88d0e16..164066a88 100644 --- a/erasure/encode.go +++ b/erasure/encode.go @@ -20,7 +20,7 @@ package erasure // #cgo CPPFLAGS: -Iisal/include -// #cgo LDFLAGS: isal/isa-l.so +// #cgo LDFLAGS: isal/isa-l.a // #include // #include // #include diff --git a/isal b/isal new file mode 120000 index 000000000..2659f434d --- /dev/null +++ b/isal @@ -0,0 +1 @@ +erasure/isal \ No newline at end of file