Merge pull request #16872 from tamird/update-jemalloc

c-deps: update jemalloc to 5.0.1
cockroachdb · Jul 6, 2017 · cc676e7 · cc676e7
2 parents 4b98593 + 0ae311c
commit cc676e7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/c-deps/jemalloc b/c-deps/jemalloc
diff --git a/pkg/ccl/storageccl/engineccl/rocksdb_jemalloc.go b/pkg/ccl/storageccl/engineccl/rocksdb_jemalloc.go
@@ -20,5 +20,5 @@ package engineccl
 
 // #cgo LDFLAGS: -ljemalloc
 // #cgo dragonfly freebsd LDFLAGS: -lm
-// #cgo linux LDFLAGS: -lrt -lm -lpthread
+// #cgo linux LDFLAGS: -lrt -lm -lpthread -ldl
 import "C"
diff --git a/pkg/cli/start_jemalloc.go b/pkg/cli/start_jemalloc.go
@@ -21,7 +21,7 @@ package cli
 // #cgo CPPFLAGS: -DJEMALLOC_NO_DEMANGLE
 // #cgo LDFLAGS: -ljemalloc
 // #cgo dragonfly freebsd LDFLAGS: -lm
-// #cgo linux LDFLAGS: -lrt -lm -lpthread
+// #cgo linux LDFLAGS: -lrt -lm -lpthread -ldl
 //
 // #include <jemalloc/jemalloc.h>
 // #include <stddef.h>

diff --git a/pkg/server/status/runtime_jemalloc.go b/pkg/server/status/runtime_jemalloc.go
@@ -27,7 +27,7 @@ package status
 // // Manually force the presence of these symbols on macOS.
 // #cgo darwin LDFLAGS: -u_je_zone_register
 // #cgo dragonfly freebsd LDFLAGS: -lm
-// #cgo linux LDFLAGS: -lrt -lm -lpthread
+// #cgo linux LDFLAGS: -lrt -lm -lpthread -ldl
 //
 // #include <jemalloc/jemalloc.h>
 //

diff --git a/pkg/storage/engine/rocksdb_jemalloc.go b/pkg/storage/engine/rocksdb_jemalloc.go
@@ -20,5 +20,5 @@ package engine
 
 // #cgo LDFLAGS: -ljemalloc
 // #cgo dragonfly freebsd LDFLAGS: -lm
-// #cgo linux LDFLAGS: -lrt -lm -lpthread
+// #cgo linux LDFLAGS: -lrt -lm -lpthread -ldl
 import "C"