diff --git a/pkgs/crc32c/cpu/cpu.go b/pkgs/crc32c/cpu/cpu.go
index 75dcc1607..d3fed494a 100644
--- a/pkgs/crc32c/cpu/cpu.go
+++ b/pkgs/crc32c/cpu/cpu.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build amd64
 
 package cpu
 
diff --git a/pkgs/crc32c/crc32c.go b/pkgs/crc32c/crc32c.go
index 96edb5318..52b109107 100644
--- a/pkgs/crc32c/crc32c.go
+++ b/pkgs/crc32c/crc32c.go
@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build amd64
 
 package crc32c
 
diff --git a/pkgs/erasure/decode.go b/pkgs/erasure/decode.go
index cce12a7c0..28fd28cd4 100644
--- a/pkgs/erasure/decode.go
+++ b/pkgs/erasure/decode.go
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-// +build linux
+// +build amd64
 
 package erasure
 
 // #cgo CPPFLAGS: -Iisal/include
-// #cgo LDFLAGS: isal/isa-l.a
 // #include <stdlib.h>
 // #include <erasure-code.h>
 // #include <stdlib.h>
diff --git a/pkgs/erasure/encode.go b/pkgs/erasure/encode.go
index 97511f7aa..7be20a9fb 100644
--- a/pkgs/erasure/encode.go
+++ b/pkgs/erasure/encode.go
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-// +build linux
+// +build amd64
 
 package erasure
 
-// #cgo CPPFLAGS: -I./isal/include
-// #cgo LDFLAGS: ./isal/isa-l.a
+// #cgo CPPFLAGS: -Iisal/include
+// #cgo LDFLAGS: isal/isa-l.a
 // #include <stdlib.h>
 // #include <erasure-code.h>
 // #include <stdlib.h>
diff --git a/pkgs/signify/signify.go b/pkgs/signify/signify.go
index 36eee0bbb..41df53888 100644
--- a/pkgs/signify/signify.go
+++ b/pkgs/signify/signify.go
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-// +build linux
-// amd64
+// +build amd64
 
 package signify
 
diff --git a/pkgs/split/split.go b/pkgs/split/split.go
index f0e996252..f9c5bcf13 100644
--- a/pkgs/split/split.go
+++ b/pkgs/split/split.go
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-// +build linux
-// amd64
+// +build amd64
 
 package split