summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2019-04-25 10:49:59 -0400
committerAndrew Gallant <jamslam@gmail.com>2019-04-25 11:12:14 -0400
commit5ce2d7351dba9c113318f4e43c041be7c25eaee4 (patch)
tree4b519245d76ade4ed9c2b1e8c1be7d10623f6b94 /src
parent9dcfd9a205914af1398d0c655956b2045f51b125 (diff)
ci: use cross for musl x86_64 builds
This is necessary because jemalloc + musl + Ubuntu 16.04 is apparently broken. Moreover, jemalloc doesn't support i686, so we accept the performance regression there. See also: https://github.com/gnzlbg/jemallocator/issues/124
Diffstat (limited to 'src')
-rw-r--r--src/main.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.rs b/src/main.rs
index d5c67a0b..bed33296 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -35,7 +35,10 @@ mod subject;
// We don't unconditionally use jemalloc because it can be nice to use the
// system's default allocator by default. Moreover, jemalloc seems to increase
// compilation times by a bit.
-#[cfg(target_env = "musl")]
+//
+// Moreover, we only do this on 64-bit systems since jemalloc doesn't support
+// i686.
+#[cfg(all(target_env = "musl", target_pointer_width = "64"))]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;