Merge pull request #29 from fkautz/pr_out_fixing_isal_compile_from_root_workaround_for_https_code_google_com_p_go_issues_detail_id_7891

Fixing isal compile from root, workaround for https://code.google.com/p/go/issues/detail?id=7891
10 years ago · 324c23f12e
parent 084d029b54 1a6b9ccfc8
commit 324c23f12e
4 changed files with 10 additions and 6 deletions
--- a/11
+++ b/11
@ -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 ./...
--- 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 <stdlib.h>
 // #include <erasure-code.h>
 // #include <stdlib.h>
--- 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 <stdlib.h>
 // #include <erasure-code.h>
 // #include <stdlib.h>
--- a/1
+++ b/1
@ -0,0 +1 @@
+erasure/isal