diff --git a/ChangeLog b/ChangeLog index 58ca0273fe..8d0d3eafd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Mar 8 23:02:50 2009 Nobuyoshi Nakada + + * win32/Makefile.sub (LDFLAGS): always prepends -link. + Sun Mar 8 11:39:57 2009 Nobuyoshi Nakada * configure.in (RUBY_CHECK_SIZEOF): dirty hack to compute multiple diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e0657c7158..441e614691 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -165,8 +165,9 @@ CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) CXXFLAGS = $(CFLAGS) !endif !if !defined(LDFLAGS) -LDFLAGS = -link -incremental:no -debug -opt:ref -opt:icf +LDFLAGS = -incremental:no -debug -opt:ref -opt:icf !endif +LDFLAGS = -link $(LDFLAGS) !if !defined(XLDFLAGS) XLDFLAGS = -stack:$(STACK) !endif