[前][次][番号順一覧][スレッド一覧]

ruby-changes:38080

From: nobu <ko1@a...>
Date: Sat, 4 Apr 2015 10:03:02 +0900 (JST)
Subject: [ruby-changes:38080] nobu:r50161 (trunk): stub.o: under win32

nobu	2015-04-04 10:02:51 +0900 (Sat, 04 Apr 2015)

  New Revision: 50161

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50161

  Log:
    stub.o: under win32
    
    * cygwin/GNUmakefile.in, win32/Makefile.sub (stub.o): make under
      win32 directory.

  Modified files:
    trunk/cygwin/GNUmakefile.in
    trunk/win32/Makefile.sub
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 50160)
+++ cygwin/GNUmakefile.in	(revision 50161)
@@ -67,11 +67,11 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@ https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L67
 	$(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 $@
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 50160)
+++ win32/Makefile.sub	(revision 50161)
@@ -977,9 +977,9 @@ $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $( https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L977
 !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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]