diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2011-03-23 17:48:32 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2011-03-23 17:48:32 -0700 |
| commit | 9aae2486499f1fd954347bbf82190e5d77d3ebb0 (patch) | |
| tree | cdb6ed775a3bd3d7d81420f3699fb24bdfa49c5d | |
| parent | 41be79acf3e72d30bee1d3b3b97180deb8311728 (diff) | |
| download | rust-9aae2486499f1fd954347bbf82190e5d77d3ebb0.tar.gz rust-9aae2486499f1fd954347bbf82190e5d77d3ebb0.zip | |
build: Use the .def files when linking on Windows
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 8685cfa6a54..88773679fca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -140,12 +140,17 @@ ifdef CFG_GCC CFG_GCC_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g CFG_GCC_LINK_FLAGS += -g CFG_COMPILE_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -c -o $(1) $(2) - CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(2) CFG_DEPEND_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -MT "$(1)" -MM $(2) else CFG_ERR := $(error please try on a system with gcc) endif +ifdef CFG_WINDOWSY + CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(3) $(2) +else + CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(2) +endif + ifdef CFG_OCAMLC_OPT $(info cfg: have ocaml native compiler) OPT=.opt |