diff options
| author | Young-il Choi <duddlf.choi@samsung.com> | 2013-06-13 11:48:22 +0900 |
|---|---|---|
| committer | Young-il Choi <duddlf.choi@samsung.com> | 2013-06-13 11:48:22 +0900 |
| commit | 00ff170e7ff22b47ed077474c0b763cd48fd9ffb (patch) | |
| tree | 9457f16a9fb3fb389555e4ee88b41712cdc6597b | |
| parent | da510bfb4a3f6ca805e849372f9bbe7b2b0f6a61 (diff) | |
| download | rust-00ff170e7ff22b47ed077474c0b763cd48fd9ffb.tar.gz rust-00ff170e7ff22b47ed077474c0b763cd48fd9ffb.zip | |
mk: arm support - disable tls of jemalloc on rt.mk
| -rw-r--r-- | mk/rt.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index 91100822f55..1c498aacddd 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -210,6 +210,17 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS) V=$$(VERBOSE) endif +ifeq ($(OSTYPE_$(1)), linux-androideabi) +$$(JEMALLOC_LIB_$(1)_$(2)): + cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \ + --disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) --disable-tls \ + EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ + LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \ + CC="$$(CC_$(1))" \ + CXX="$$(CXX_$(1))" \ + AR="$$(AR_$(1))" + $$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc +else $$(JEMALLOC_LIB_$(1)_$(2)): cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \ --disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \ @@ -219,6 +230,7 @@ $$(JEMALLOC_LIB_$(1)_$(2)): CXX="$$(CXX_$(1))" \ AR="$$(AR_$(1))" $$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc +endif # These could go in rt.mk or rustllvm.mk, they're needed for both. |