Some work on reviving the mingw-cross build. Not working yet.

This commit is contained in:
Graydon Hoare 2011-06-27 11:53:04 -07:00
parent a6f36ba3f5
commit 8fc51dfc65
3 changed files with 13 additions and 6 deletions

View File

@ -171,9 +171,9 @@ export CFG_LLVM_ROOT
# Subprograms
######################################################################
LLVM_AS := $(CFG_LLVM_BINDIR)/llvm-as
LLVM_AS := $(CFG_LLVM_BINDIR)/llvm-as$(X)
LLC := $(CFG_LLVM_BINDIR)/llc
LLC := $(CFG_LLVM_BINDIR)/llc$(X)
######################################################################
# Single-target rules

3
configure vendored
View File

@ -95,7 +95,7 @@ opt() {
do
if [ "$arg" = "--${FLAG}-${OP}" ]
then
OP=$(echo $OP | tr 'a-z' 'A-Z')
OP=$(echo $OP | tr 'a-z-' 'A-Z_')
FLAG=$(echo $FLAG | tr 'a-z' 'A-Z')
local V="CFG_${FLAG}_${OP}"
eval $V=1
@ -165,6 +165,7 @@ fi
opt valgrind 1 "run tests with valgrind"
opt docs 1 "build documentation"
opt optimize 1 "build optimized rust code"
opt mingw-cross 0 "cross-compile for win32 using mingw"
if [ $HELP -eq 1 ]

View File

@ -103,9 +103,10 @@ ifdef CFG_UNIXY
$(CFG_LDENV)=$(call CFG_TESTLIB,$(1)):$(CFG_LDPATH) \
$(CFG_VALGRIND) $(1)
ifdef MINGW_CROSS
ifdef CFG_ENABLE_MINGW_CROSS
CFG_EXE_SUFFIX := .exe
CFG_LIB_NAME=$(1).dll
CFG_DEF_SUFFIX := .def
CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_BINDIR)
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
@ -116,8 +117,13 @@ ifdef CFG_UNIXY
ifdef CFG_VALGRIND
CFG_VALGRIND += wine
endif
CFG_GCCISH_CFLAGS := -march=i686
CFG_GCCISH_CFLAGS := -march=i686 -O2
CFG_GCCISH_PRE_LIB_FLAGS :=
CFG_GCCISH_POST_LIB_FLAGS :=
CFG_GCCISH_DEF_FLAG :=
CFG_GCCISH_LINK_FLAGS := -shared
ifeq ($(CFG_CPUTYPE), x86_64)
CFG_GCCISH_CFLAGS += -m32
CFG_GCCISH_LINK_FLAGS += -m32