Skip to content

Commit da7cb54

Browse files
committed
---
yaml --- r: 1827 b: refs/heads/master c: 9aae248 h: refs/heads/master i: 1825: 8cca4b8 1823: 6be98c8 v: v3
1 parent 7f59da2 commit da7cb54

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 41be79acf3e72d30bee1d3b3b97180deb8311728
2+
refs/heads/master: 9aae2486499f1fd954347bbf82190e5d77d3ebb0

trunk/Makefile.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,17 @@ ifdef CFG_GCC
140140
CFG_GCC_CFLAGS += -Wall -Werror -fno-rtti -fno-exceptions -g
141141
CFG_GCC_LINK_FLAGS += -g
142142
CFG_COMPILE_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -c -o $(1) $(2)
143-
CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(2)
144143
CFG_DEPEND_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_CFLAGS) -MT "$(1)" -MM $(2)
145144
else
146145
CFG_ERR := $(error please try on a system with gcc)
147146
endif
148147

148+
ifdef CFG_WINDOWSY
149+
CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(3) $(2)
150+
else
151+
CFG_LINK_C = $(CFG_GCC_CROSS)g++ $(CFG_GCC_LINK_FLAGS) -o $(1) $(2)
152+
endif
153+
149154
ifdef CFG_OCAMLC_OPT
150155
$(info cfg: have ocaml native compiler)
151156
OPT=.opt

0 commit comments

Comments
 (0)