---

yaml
---
r: 6103
b: refs/heads/master
c: f0c1f99
h: refs/heads/master
i:
  6101: eba36c2
  6099: c9e4cbb
  6095: c38ede3
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20946e697010f886cb9aec2390e083439b274123
+refs/heads/master: f0c1f999ac8c1ee2d823806429b6eebce0b7e854

trunk/mk/rt.mk

@@ -84,21 +84,21 @@ RUNTIME_HDR := rt/globals.h \
 
 ifeq ($(CFG_WINDOWSY), 1)
   LIBUV_OSTYPE := win
-  LIBUV_ARCH := i386
+  LIBUV_ARCH := ia32
   LIBUV_LIB := rt/libuv/Default/obj.target/src/rt/libuv/libuv.a
 else ifeq ($(CFG_OSTYPE), apple-darwin)
   LIBUV_OSTYPE := mac
-  LIBUV_ARCH := i386
+  LIBUV_ARCH := ia32
   LIBUV_LIB := rt/libuv/Default/libuv.a
 else
   LIBUV_OSTYPE := unix
-  LIBUV_ARCH := i386
+  LIBUV_ARCH := ia32
   LIBUV_LIB := rt/libuv/Default/obj.target/src/rt/libuv/libuv.a
 endif
 
 RUNTIME_DEF := rt/rustrt$(CFG_DEF_SUFFIX)
 RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash \
-                -I $(S)src/rt/arch/x86_64 \
+                -I $(S)src/rt/arch/i386 \
 				-I $(S)src/rt/libuv/include
 RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) $(RUNTIME_LL:.ll=.o) $(RUNTIME_S:.S=.o)
 RUNTIME_LIBS := $(LIBUV_LIB)