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

ruby-changes:53628

From: nobu <ko1@a...>
Date: Tue, 20 Nov 2018 19:29:11 +0900 (JST)
Subject: [ruby-changes:53628] nobu:r65880 (trunk): Fix typo and make directory

nobu	2018-11-20 19:29:03 +0900 (Tue, 20 Nov 2018)

  New Revision: 65880

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

  Log:
    Fix typo and make directory
    
    * common.mk (coroutine/amd64/Context.$(OBJEXT)): fix a typo,
      $(OBJECT).
    
    * common.mk (coroutine/amd64): recipe to make object directory.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 65879)
+++ common.mk	(revision 65880)
@@ -852,7 +852,7 @@ exe/$(PROGRAM): ruby-runner.c ruby-runne https://github.com/ruby/ruby/blob/trunk/common.mk#L852
 	$(@F) $(@D)
 
 exe/.time:
-	$(Q) $(MAKEDIRS) exe $(@D)
+	$(Q) $(MAKEDIRS) $(@D)
 	@exit > $@
 
 $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
@@ -895,7 +895,11 @@ strstr.$(OBJEXT): {$(VPATH)}strstr.c https://github.com/ruby/ruby/blob/trunk/common.mk#L895
 nt.$(OBJEXT): {$(VPATH)}nt.c
 ia64.$(OBJEXT): {$(VPATH)}ia64.s
 	$(CC) $(CFLAGS) -c $<
-coroutine/amd64/Context.$(OBJECT): {$(VPATH)}coroutine/amd64/Context.s
+coroutine/amd64/Context.$(OBJEXT): {$(VPATH)}coroutine/amd64/Context.s
+coroutine/amd64/Context.$(OBJEXT): coroutine/amd64/.time
+coroutine/amd64/.time:
+	$(Q) $(MAKEDIRS) $(@D)
+	@exit > $@
 
 ###
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 65879)
+++ win32/Makefile.sub	(revision 65880)
@@ -1226,11 +1226,9 @@ $(ruby_pc): $(RBCONFIG) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1226
 
 {$(srcdir)/coroutine/Win32}.asm.obj:
 	$(ECHO) assembling $(<:\=/)
-	@if not exist $(@D:/=\) md $(@D:/=\)
 	$(Q) $(AS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/)
 {$(srcdir)/coroutine/Win64}.asm.obj:
 	$(ECHO) assembling $(<:\=/)
-	@if not exist $(@D:/=\) md $(@D:/=\)
 	$(Q) $(AS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/)
 
 {$(srcdir)/enc/trans}.c.obj:
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65879)
+++ Makefile.in	(revision 65880)
@@ -406,7 +406,6 @@ $(srcdir)/enc/jis/props.h: enc/jis/props https://github.com/ruby/ruby/blob/trunk/Makefile.in#L406
 
 .s.@OBJEXT@:
 	@$(ECHO) assembling $<
-	$(Q) $(MAKEDIRS) $(@D)
 	$(Q) $(CC) $(ASFLAGS) -o $@ -c $<
 
 .c.S:

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

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