diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 09:37:11 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 09:37:11 +0000 |
| commit | a84943653947358d056c513cadc522c41f0e1d81 (patch) | |
| tree | bc8315311b13bc3c3d540243cab3bfe64bbcd41d /cygwin | |
| parent | 4f7232fd2ea60b0689ed7fce4b1d07b42d2e35f8 (diff) | |
merges r29516 from trunk into ruby_1_9_2.
--
* Makefile.in (CPP): already used in .c.i rule.
* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
--preprocessor options explicitly. [ruby-core:32776]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/GNUmakefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index eb6967aef5..e1cb84d3c2 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -2,7 +2,8 @@ include Makefile -include uncommon.mk ENABLE_SHARED=@ENABLE_SHARED@ -DLLWRAP = @DLLWRAP@ --target=@target_os@ +DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)" +WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED ifeq (@target_os@,cygwin) DLL_BASE_NAME := $(LIBRUBY_SO:.dll=) @@ -38,7 +39,7 @@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO) $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc - @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ + $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ $(RCFILES): $(RBCONFIG) @$(MINIRUBY) $(srcdir)/win32/resource.rb \ |