summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-08 14:02:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-08 14:02:50 +0000
commit7c6b3c7e90947c19274907def320e05b088010da (patch)
treeab8ca611ce0954f79afd94569ac9cebdc4fcc0db
parent1a3843015c7bbe424cbe1ab98d3cdd76afd14af4 (diff)
downloadruby-7c6b3c7e90947c19274907def320e05b088010da.tar.gz
ruby-7c6b3c7e90947c19274907def320e05b088010da.tar.xz
ruby-7c6b3c7e90947c19274907def320e05b088010da.zip
* win32/Makefile.sub (LDFLAGS): always prepends -link.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 58ca0273f..8d0d3eafd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 8 23:02:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/Makefile.sub (LDFLAGS): always prepends -link.
+
Sun Mar 8 11:39:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_CHECK_SIZEOF): dirty hack to compute multiple
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e0657c715..441e61469 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