ruby-changes:53840
From: nobu <ko1@a...>
Date: Wed, 28 Nov 2018 10:04:45 +0900 (JST)
Subject: [ruby-changes:53840] nobu:r66058 (trunk): win32/Makefile.sub: add flags for AS
nobu 2018-11-28 10:04:38 +0900 (Wed, 28 Nov 2018) New Revision: 66058 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66058 Log: win32/Makefile.sub: add flags for AS Modified files: trunk/win32/Makefile.sub trunk/win32/setup.mak Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 66057) +++ win32/Makefile.sub (revision 66058) @@ -1227,10 +1227,10 @@ $(ruby_pc): $(RBCONFIG) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1227 {$(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 $(<:\=/) Index: win32/setup.mak =================================================================== --- win32/setup.mak (revision 66057) +++ win32/setup.mak (revision 66058) @@ -20,8 +20,9 @@ MAKE = $(MAKE) -f $(MAKEFILE) https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L20 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 https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L238 # 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/