b980f22877
The `--disable-jemalloc` configure option has a failure mode where it will create a distribution that is not compatible with other compilers. For example the nightly for Linux will assume that it will link to jemalloc by default as an allocator for executable crates. If, however, a standard library is used which was built via `./configure --disable-jemalloc` then this will fail because the jemalloc crate wasn't built. While this seems somewhat reasonable as a niche situation, the same mechanism is used for disabling jemalloc for platforms that just don't support it. For example if the rumprun target is compiled then the sibiling Linux target *also* doesn't have jemalloc. This is currently a problem for our cross-build nightlies which build many targets. If rumprun is also built, it will disable jemalloc for all targets, which isn't desired. This commit moves the platform-specific disabling of jemalloc as hardcoded logic into the makefiles that is scoped per-platform. This way when configuring multiple targets **without the `--disable-jemalloc` option specified** all targets will get jemalloc as they should.
29 lines
1.3 KiB
Makefile
29 lines
1.3 KiB
Makefile
# i686-pc-windows-msvc configuration
|
|
CC_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
|
|
LINK_i686-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
|
|
CXX_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
|
|
CPP_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
|
|
AR_i686-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
|
|
CFG_LIB_NAME_i686-pc-windows-msvc=$(1).dll
|
|
CFG_STATIC_LIB_NAME_i686-pc-windows-msvc=$(1).lib
|
|
CFG_LIB_GLOB_i686-pc-windows-msvc=$(1)-*.{dll,lib}
|
|
CFG_LIB_DSYM_GLOB_i686-pc-windows-msvc=$(1)-*.dylib.dSYM
|
|
CFG_JEMALLOC_CFLAGS_i686-pc-windows-msvc :=
|
|
CFG_GCCISH_CFLAGS_i686-pc-windows-msvc := -MD
|
|
CFG_GCCISH_CXXFLAGS_i686-pc-windows-msvc := -MD
|
|
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-msvc :=
|
|
CFG_GCCISH_DEF_FLAG_i686-pc-windows-msvc :=
|
|
CFG_LLC_FLAGS_i686-pc-windows-msvc :=
|
|
CFG_INSTALL_NAME_i686-pc-windows-msvc =
|
|
CFG_EXE_SUFFIX_i686-pc-windows-msvc := .exe
|
|
CFG_WINDOWSY_i686-pc-windows-msvc := 1
|
|
CFG_UNIXY_i686-pc-windows-msvc :=
|
|
CFG_LDPATH_i686-pc-windows-msvc :=
|
|
CFG_RUN_i686-pc-windows-msvc=$(2)
|
|
CFG_RUN_TARG_i686-pc-windows-msvc=$(call CFG_RUN_i686-pc-windows-msvc,,$(2))
|
|
CFG_GNU_TRIPLE_i686-pc-windows-msvc := i686-pc-win32
|
|
|
|
# Currently the build system is not configured to build jemalloc
|
|
# with MSVC, so we omit this optional dependency.
|
|
CFG_DISABLE_JEMALLOC_i686-pc-windows-msvc := 1
|