mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 07:14:28 +00:00
mk: Restore toolchain config for i386 mac/linux, and freebsd
Conflicts: mk/platform.mk
This commit is contained in:
parent
e971d0ce9f
commit
dae97b4812
@ -59,6 +59,20 @@ CFG_LDPATH_x86_64-unknown-linux-gnu :=
|
|||||||
CFG_RUN_x86_64-unknown-linux-gnu=$(2)
|
CFG_RUN_x86_64-unknown-linux-gnu=$(2)
|
||||||
CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
|
CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
|
||||||
|
|
||||||
|
# i686-unknown-linux-gnu configuration
|
||||||
|
CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
|
||||||
|
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
|
||||||
|
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
|
||||||
|
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
|
||||||
|
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
|
||||||
|
CFG_GCCISH_LINK_FLAGS_i6868-unknown-linux-gnu := -shared -fPIC -ldl -lpthread -lrt -g -m32
|
||||||
|
CFG_GCCISH_DEF_FLAG_i6868-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
|
||||||
|
CFG_GCCISH_PRE_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-whole-archive
|
||||||
|
CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive -Wl,-znoexecstack
|
||||||
|
CFG_DEF_SUFFIX_i686-unknown-linux-gnu := .linux.def
|
||||||
|
CFG_INSTALL_NAME_i686-unknown-linux-gnu =
|
||||||
|
CFG_GCCISH_CROSS_i686-unknown-linux-gnu =
|
||||||
|
|
||||||
# x86_64-apple-darwin configuration
|
# x86_64-apple-darwin configuration
|
||||||
CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
|
CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
|
||||||
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
|
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
|
||||||
@ -80,6 +94,19 @@ CFG_LDPATH_x86_64-apple-darwin :=
|
|||||||
CFG_RUN_x86_64-apple-darwin=$(2)
|
CFG_RUN_x86_64-apple-darwin=$(2)
|
||||||
CFG_RUN_TARG_x86_64-apple-darwin=$(call CFG_RUN_x86_64-apple-darwin,,$(2))
|
CFG_RUN_TARG_x86_64-apple-darwin=$(call CFG_RUN_x86_64-apple-darwin,,$(2))
|
||||||
|
|
||||||
|
# i686-apple-darwin configuration
|
||||||
|
CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
|
||||||
|
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
|
||||||
|
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
|
||||||
|
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
|
||||||
|
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
|
||||||
|
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind -m32
|
||||||
|
CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
|
||||||
|
CFG_GCCISH_PRE_LIB_FLAGS_i686-apple-darwin :=
|
||||||
|
CFG_GCCISH_POST_LIB_FLAGS_i686-apple-darwin :=
|
||||||
|
CFG_DEF_SUFFIX_i686-apple-darwin := .darwin.def
|
||||||
|
CFG_INSTALL_NAME_i686-apple-darwin = -Wl,-install_name,@rpath/$(1)
|
||||||
|
|
||||||
# arm-unknown-android configuration
|
# arm-unknown-android configuration
|
||||||
CFG_LIB_NAME_arm-unknown-android=lib$(1).so
|
CFG_LIB_NAME_arm-unknown-android=lib$(1).so
|
||||||
CFG_LIB_GLOB_arm-unknown-android=lib$(1)-*.so
|
CFG_LIB_GLOB_arm-unknown-android=lib$(1)-*.so
|
||||||
@ -148,6 +175,18 @@ CFG_LDPATH_i586-mingw32msvc :=
|
|||||||
CFG_RUN_i586-mingw32msvc=
|
CFG_RUN_i586-mingw32msvc=
|
||||||
CFG_RUN_TARG_i586-mingw32msvc=
|
CFG_RUN_TARG_i586-mingw32msvc=
|
||||||
|
|
||||||
|
# x86_64-unknown-freebsd configuration
|
||||||
|
CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
|
||||||
|
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
|
||||||
|
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd += -fPIC -I/usr/local/include
|
||||||
|
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd += -shared -fPIC -lpthread -lrt
|
||||||
|
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
|
||||||
|
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-whole-archive
|
||||||
|
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-no-whole-archive
|
||||||
|
CFG_DEF_SUFFIX_x86_64-unknown-freebsd := .bsd.def
|
||||||
|
CFG_INSTALL_NAME_x86_64-unknown-freebsd =
|
||||||
|
CFG_GCCISH_CROSS_x86_64-unknown-freebsd =
|
||||||
|
|
||||||
# Hack: not sure how to test if a file exists in make other than this
|
# Hack: not sure how to test if a file exists in make other than this
|
||||||
OS_SUPP = $(patsubst %,--suppressions=%,\
|
OS_SUPP = $(patsubst %,--suppressions=%,\
|
||||||
$(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))
|
$(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))
|
||||||
|
Loading…
Reference in New Issue
Block a user