Skip to content

Commit 45f588e

Browse files
committed
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.
2 parents b0e3ffd + 474bd60 commit 45f588e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/rt/jemalloc/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ vpath % .
99
SHELL := /bin/sh
1010

1111
CC := @CC@
12+
AR := @AR@
1213

1314
# Configuration parameters.
1415
DESTDIR =

src/rt/jemalloc/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4453,7 +4453,7 @@ PIC_CFLAGS='-fPIC -DPIC'
44534453
CTARGET='-o $@'
44544454
LDTARGET='-o $@'
44554455
EXTRA_LDFLAGS=
4456-
MKLIB='ar crus $@'
4456+
MKLIB='$(AR) crus $@'
44574457
CC_MM=1
44584458
44594459
default_munmap="1"

0 commit comments

Comments
 (0)