From 8ebcab711d76bf903f5c3d61e3419e064496bac0 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Mon, 27 Jun 2011 12:43:45 -0700
Subject: [PATCH] More work on mingw cross build.

---
 mk/platform.mk | 4 ++--
 mk/rustllvm.mk | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/platform.mk b/mk/platform.mk
index 1f43833828a..020595015af 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -111,14 +111,14 @@ ifdef CFG_UNIXY
     CFG_LDPATH :=$(CFG_LDPATH):$$PATH
     CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
     CFG_RUN_TEST=PATH=$(CFG_LDPATH):$(call CFG_TESTLIB,$(1)) $(1)
-
+    CFG_WINDOWSY := 1
     CFG_INFO := $(info cfg: mingw-cross)
     CFG_GCCISH_CROSS := i586-mingw32msvc-
     ifdef CFG_VALGRIND
       CFG_VALGRIND += wine
     endif
 
-    CFG_GCCISH_CFLAGS := -march=i686 -O2
+    CFG_GCCISH_CFLAGS := -fno-strict-aliasing -march=i686 -O2
     CFG_GCCISH_PRE_LIB_FLAGS :=
     CFG_GCCISH_POST_LIB_FLAGS :=
     CFG_GCCISH_DEF_FLAG :=
diff --git a/mk/rustllvm.mk b/mk/rustllvm.mk
index 876cb6766e8..bcae15679c4 100644
--- a/mk/rustllvm.mk
+++ b/mk/rustllvm.mk
@@ -22,7 +22,8 @@ RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
 rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
 	@$(call E, archive: $@)
 	$(Q)rm -f $@
-	$(Q)ar crs $@ $^
+	$(Q)$(CFG_GCCISH_CROSS)ar crs $@ $^
+	$(Q)$(CFG_GCCISH_CROSS)ranlib $@
 
 # Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
 # it has no -whole-archive.