diff options
| author | bors <bors@rust-lang.org> | 2013-07-04 12:07:56 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-04 12:07:56 -0700 |
| commit | f8507778a36478035f46bfa9f925398a36cd443f (patch) | |
| tree | 3effdec580b85d0d1e817fd401c555902c01fade | |
| parent | 3d7c1ddf74f9ea678c9f22d609d67cfdd3a2ad3f (diff) | |
| parent | 5007fb2d4dc5a7bcdacd55e6e8b14f6973c2490c (diff) | |
| download | rust-f8507778a36478035f46bfa9f925398a36cd443f.tar.gz rust-f8507778a36478035f46bfa9f925398a36cd443f.zip | |
auto merge of #7547 : luqmana/rust/mingw64, r=yichoi
Add the x64 windows target to platform.mk and reorder some headers to fix build on mingw64. There are still some issues with building llvm but this gets us one step closer.
| -rw-r--r-- | mk/platform.mk | 29 | ||||
| -rw-r--r-- | src/rt/rust_uv.cpp | 3 |
2 files changed, 29 insertions, 3 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 4bb8de28aef..61a170c21d5 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -323,9 +323,9 @@ AR_i686-pc-mingw32=$(AR) CFG_LIB_NAME_i686-pc-mingw32=$(1).dll CFG_LIB_GLOB_i686-pc-mingw32=$(1)-*.dll CFG_LIB_DSYM_GLOB_i686-pc-mingw32=$(1)-*.dylib.dSYM -CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -march=i686 +CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -m32 -march=i686 -D_WIN32_WINNT=0x0600 CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti -CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g +CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g -m32 CFG_GCCISH_DEF_FLAG_i686-pc-mingw32 := CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 := CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 := @@ -367,6 +367,31 @@ CFG_LDPATH_i586-mingw32msvc := CFG_RUN_i586-mingw32msvc= CFG_RUN_TARG_i586-mingw32msvc= +# x86_64-w64-mingw32 configuration +CC_x86_64-w64-mingw32=$(CC) +CXX_x86_64-w64-mingw32=$(CXX) +CPP_x86_64-w64-mingw32=$(CPP) +AR_x86_64-w64-mingw32=$(AR) +CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll +CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll +CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM +CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 +CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti +CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -fPIC -g -m64 +CFG_GCCISH_DEF_FLAG_x86_64-w64-mingw32 := +CFG_GCCISH_PRE_LIB_FLAGS_x86_64-w64-mingw32 := +CFG_GCCISH_POST_LIB_FLAGS_x86_64-w64-mingw32 := +CFG_DEF_SUFFIX_x86_64-w64-mingw32 := .mingw32.def +CFG_INSTALL_NAME_x86_64-w64-mingw32 = +CFG_LIBUV_LINK_FLAGS_x86_64-w64-mingw32 := -lWs2_32 -lpsapi -liphlpapi +CFG_EXE_SUFFIX_x86_64-w64-mingw32 := .exe +CFG_WINDOWSY_x86_64-w64-mingw32 := 1 +CFG_UNIXY_x86_64-w64-mingw32 := +CFG_PATH_MUNGE_x86_64-w64-mingw32 := +CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH) +CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2) +CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD_TRIPLE)),$(2)) + # x86_64-unknown-freebsd configuration CC_x86_64-unknown-freebsd=$(CC) CXX_x86_64-unknown-freebsd=$(CXX) diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index fefcbbcacf7..dbd52e088f0 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -13,10 +13,11 @@ #include <malloc.h> #endif +#include "uv.h" + #include "rust_globals.h" #include "rust_task.h" #include "rust_log.h" -#include "uv.h" // extern fn pointers typedef void (*extern_async_op_cb)(uv_loop_t* loop, void* data, |