diff options
| author | bors <bors@rust-lang.org> | 2013-06-21 04:10:53 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-21 04:10:53 -0700 |
| commit | 45f588e8fd938c65df056ab72861e144cf35e674 (patch) | |
| tree | 74dc734fb0c5477c2a3c25ee0a854317b6f743d5 /src/rt | |
| parent | b0e3ffd3805203420846296bc7d5a3c13dfd8b3a (diff) | |
| parent | 474bd60c1bc242664bff876804e8fa4c5b27214d (diff) | |
| download | rust-45f588e8fd938c65df056ab72861e144cf35e674.tar.gz rust-45f588e8fd938c65df056ab72861e144cf35e674.zip | |
auto merge of #7200 : yichoi/rust/fix_je_mac_cross, r=brson
while cross-compiling, ar in cross toolchains are required. linux is not sensitive so could not see errors.
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/jemalloc/Makefile.in | 1 | ||||
| -rwxr-xr-x | src/rt/jemalloc/configure | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/rt/jemalloc/Makefile.in b/src/rt/jemalloc/Makefile.in index 74810472d11..e3cecb0e840 100644 --- a/src/rt/jemalloc/Makefile.in +++ b/src/rt/jemalloc/Makefile.in @@ -9,6 +9,7 @@ vpath % . SHELL := /bin/sh CC := @CC@ +AR := @AR@ # Configuration parameters. DESTDIR = diff --git a/src/rt/jemalloc/configure b/src/rt/jemalloc/configure index 67f3dc30902..428ac770a22 100755 --- a/src/rt/jemalloc/configure +++ b/src/rt/jemalloc/configure @@ -4453,7 +4453,7 @@ PIC_CFLAGS='-fPIC -DPIC' CTARGET='-o $@' LDTARGET='-o $@' EXTRA_LDFLAGS= -MKLIB='ar crus $@' +MKLIB='$(AR) crus $@' CC_MM=1 default_munmap="1" |