diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 13:12:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 13:12:34 +0000 |
| commit | fddf7a051864d5c0cd6435198ba0be14916c9c70 (patch) | |
| tree | 16aa7d1c2a507ebcbe10f35aedbf2b7dd95024f7 /win32 | |
| parent | 54c979e979034d661e4c41e01be8a032e82a342b (diff) | |
update-deps: support coroutine dependencies
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 7692173140..399bf2f772 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -290,13 +290,18 @@ MISSING = $(MISSING) explicit_bzero.obj !endif DLNOBJ = dln.obj !if "$(ARCH)" == "x64" -COROUTINE_H = coroutine/Win64/Context.h +COROUTINE_OBJ = coroutine/Win64/Context.obj !elseif "$(ARCH)" == "i386" +COROUTINE_OBJ = coroutine/Win32/Context.obj +!else +COROUTINE_OBJ = +!endif +!if "$(COROUTINE_OBJ)" == "" +# get rid of empty value not to leave VPATH only in dependencies COROUTINE_H = coroutine/Win32/Context.h !else -COROUTINE_H = +COROUTINE_H = $(COROUTINE_OBJ:.obj=.h) !endif -COROUTINE_OBJ = $(COROUTINE_H:.h=.obj) ARFLAGS = -machine:$(MACHINE) -out: LD = $(CC) @@ -865,7 +870,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" #define STACK_GROW_DIRECTION -1 !endif -!if defined(COROUTINE_H) +!if "$(COROUTINE_OBJ)" != "" #define FIBER_USE_COROUTINE "$(COROUTINE_H)" !endif #define DEFAULT_KCODE KCODE_NONE @@ -1410,7 +1415,3 @@ mjit_config.h: @echo.>> $@ @echo #endif /* RUBY_MJIT_CONFIG_H */>> $@ @$(Q:@=: :) type $@ - -!if defined(COROUTINE_H) -cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H) -!endif |