diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-20 22:25:38 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-20 22:25:38 +0000 |
| commit | ea8c8251aace1dc57d22d863f58f7bb9ef1641e1 (patch) | |
| tree | f71d968500bb9e7d1f3b69d8166258750e9ec38f /win32/setup.mak | |
| parent | b8031a4517c12b2540616edba42f29a2fcaf088d (diff) | |
merge revision(s) 30401:
* win32/README.win32: note to need NT based OS to build ruby.
* win32/{configure.bat,setup.mak}: backport current build method from
trunk. [ruby-dev:42893] (#4206)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index fc5fc90f12..a693c243ba 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -165,7 +165,13 @@ $(CPU) = $(PROCESSOR_LEVEL) @echo $(CPU) = 6>>$(MAKEFILE) -epilogue-: nul +!if exist(confargs.c) + @$(APPEND) + @$(CPP) confargs.c 2>&1 | findstr "! =" >> $(MAKEFILE) + @del confargs.c +!endif @type << >>$(MAKEFILE) + # OS = $(OS) # RUBY_INSTALL_NAME = ruby # RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) |