aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-13 23:48:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-13 23:48:12 +0000
commit261903223a967079521c68dda54fe722de98cbf5 (patch)
tree00c87be432e1e66eac5b395b66e1daacc0ad44a9
parent327adb32e372d90ce5c53eee5915a9857910a062 (diff)
downloadruby-261903223a967079521c68dda54fe722de98cbf5.tar.gz
* win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
space and compiler command line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/setup.mak4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b61599e73d..0f441041bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 14 08:48:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
+ space and compiler command line.
+
Sun Nov 14 04:22:32 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
* symbian/setup (config.h): Added HAVE_LABS and HAVE_LLABS to config.h.
diff --git a/win32/setup.mak b/win32/setup.mak
index 1004eca771..45fcee0956 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -60,7 +60,7 @@ NTVER = $(NTVER)
!endif
<<
!if !defined(BASERUBY)
- @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I >> $(MAKEFILE)
+ @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)
!endif
-system-vars-: -runtime- -unicows-
@@ -76,7 +76,7 @@ NTVER = $(NTVER)
@echo TARGET_OS = mswin64 >>$(MAKEFILE)
-runtime-: nul
- $(CC) -MD <<rtname.c user32.lib -link > nul
+ @$(CC) -MD <<rtname.c user32.lib -link > nul
#include <windows.h>
#include <memory.h>
#include <string.h>