diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-04 01:02:51 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-04 01:02:51 +0000 |
commit | 34c83a37c23d847213f2432021624c2d7610c14a (patch) | |
tree | 653d18e37480b1b3da5a5f3ac7e383ea723aa02f | |
parent | 8bead2381521666a6cd1ad71fd0eab9e0f8617b7 (diff) |
stub.o: under win32
* cygwin/GNUmakefile.in, win32/Makefile.sub (stub.o): make under
win32 directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | cygwin/GNUmakefile.in | 4 | ||||
-rw-r--r-- | win32/Makefile.sub | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 60ff9f2ee0..425d493955 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -67,11 +67,11 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@ $(ECHO) linking $@ $(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \ $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ -$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@ +$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ win32/stub.@OBJEXT@ @rm -f $@ $(ECHO) linking $@ $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \ - stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ + win32/stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ $(RUBY_EXP): $(LIBRUBY_A) $(ECHO) creating $@ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5b4ebade95..b8bd25bd31 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -977,9 +977,9 @@ $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res !endif !if "$(STUBPROGRAM)" != "" -$(STUBPROGRAM): stub.$(OBJEXT) $(LIBRUBY) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res +$(STUBPROGRAM): win32/stub.$(OBJEXT) $(LIBRUBY) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(ECHO) linking $(@:\=/) - $(Q) $(PURIFY) $(CC) stub.$(OBJEXT) $(RUBY_INSTALL_NAME).res \ + $(Q) $(PURIFY) $(CC) win32/stub.$(OBJEXT) $(RUBY_INSTALL_NAME).res \ $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) $(Q) $(LDSHARED_0) $(Q) $(LDSHARED_1) |