summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-31 08:25:07 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-31 08:25:07 +0000
commita12ca2113d7f39b722eef252a052741261dd31e1 (patch)
treeb34521ac4b86bb8fc65138b0d3a40734aa41c1ff
parent74ec76990ac05b706d0db2e658a4aa55b5f2165c (diff)
* win32/setup.mak: $(APPEND) with some arguments insert a space before
the arguments, so it causes error if the arguments are expected to be a macro definition. this fix resolve the build error introduced at r48210. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--win32/setup.mak2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 56e8f78baf..de3445ad23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 31 17:22:19 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/setup.mak: $(APPEND) with some arguments insert a space before
+ the arguments, so it causes error if the arguments are expected to be
+ a macro definition. this fix resolve the build error introduced at
+ r48210.
+
Fri Oct 31 16:47:35 2014 Akinori MUSHA <knu@iDaemons.org>
* ext/syslog/lib/syslog/logger.rb (Syslog::Logger::VERSION): Bump
diff --git a/win32/setup.mak b/win32/setup.mak
index 2e62be194a..f64d24d331 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -155,7 +155,7 @@ MACHINE = x86
#endif
<<
!if defined($(CPU))
- @$(APPEND) $(CPU) = $(PROCESSOR_LEVEL)
+ @echo>>$(MAKEFILE) $(CPU) = $(PROCESSOR_LEVEL)
!endif
@$(APPEND)