diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 4 | ||||
| -rw-r--r-- | win32/setup.mak | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 9157ea5bf1..7ac6c6e2fd 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1227,10 +1227,10 @@ $(ruby_pc): $(RBCONFIG) {$(srcdir)/coroutine/Win32}.asm.obj: $(ECHO) assembling $(<:\=/) - $(Q) $(AS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) + $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) {$(srcdir)/coroutine/Win64}.asm.obj: $(ECHO) assembling $(<:\=/) - $(Q) $(AS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) + $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) {$(srcdir)/enc/trans}.c.obj: $(ECHO) compiling $(<:\=/) diff --git a/win32/setup.mak b/win32/setup.mak index 2b9c3553e2..eb99c6ed1d 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -20,8 +20,9 @@ MAKE = $(MAKE) -f $(MAKEFILE) MAKEFILE = Makefile !endif CPU = PROCESSOR_LEVEL -CC = cl -nologo +CC = $(CC) -nologo CPP = $(CC) -EP +AS = $(AS) -nologo all: -prologue- -generic- -epilogue- i386-mswin32: -prologue- -i386- -epilogue- @@ -237,7 +238,8 @@ MACHINE = x86 # XLDFLAGS = # RFLAGS = -r # EXTLIBS = -CC = cl -nologo +CC = $(CC) +AS = $(AS) << @(for %I in (cl.exe) do @set MJIT_CC=%~$$PATH:I) && (call echo MJIT_CC = "%MJIT_CC:\=/%" -nologo>>$(MAKEFILE)) @type << >>$(MAKEFILE) |