summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 10:29:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 10:29:03 +0000
commit973bcc59534eea5e67a7d08a4d827805b6afc38d (patch)
treee0882e3b6e5539d866d8f47a73bd04d7659f129f
parent3ccb5b9770f86a4e59fb5f6e2f72d4b31f209b76 (diff)
Fix typo and make directory
* common.mk (coroutine/amd64/Context.$(OBJEXT)): fix a typo, $(OBJECT). * common.mk (coroutine/amd64): recipe to make object directory. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in1
-rw-r--r--common.mk8
-rw-r--r--win32/Makefile.sub2
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index c738d99..80c5e47 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,7 +406,6 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd
.s.@OBJEXT@:
@$(ECHO) assembling $<
- $(Q) $(MAKEDIRS) $(@D)
$(Q) $(CC) $(ASFLAGS) -o $@ -c $<
.c.S:
diff --git a/common.mk b/common.mk
index 7a00667..1cf0def 100644
--- a/common.mk
+++ b/common.mk
@@ -852,7 +852,7 @@ exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time miniruby$(EXEEXT) {$(VPATH
$(@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
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 > $@
###
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 1f04593..0892d8f 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1226,11 +1226,9 @@ $(ruby_pc): $(RBCONFIG)
{$(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: