kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[Win32] Fix assembler name when cross compiling

Browse source 
Hostx64\x86\nmake.exe sets AS to ml64 which targets amd64, but we
need assembler for x86.
This commit is contained in:
Nobuyoshi Nakada 2021-07-04 10:45:24 +09:00
parent ac6924e10e
commit eaa1c3190a
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
win32/setup.mak
View file

@ -22,7 +22,6 @@ MAKEFILE = Makefile
CPU = PROCESSOR_LEVEL CPU = PROCESSOR_LEVEL
CC = $(CC) -nologo CC = $(CC) -nologo
CPP = $(CC) -EP CPP = $(CC) -EP
AS = $(AS) -nologo
all: -prologue- -generic- -epilogue- all: -prologue- -generic- -epilogue-
i386-mswin32: -prologue- -i386- -epilogue- i386-mswin32: -prologue- -i386- -epilogue-
@ -237,8 +236,15 @@ MACHINE = x86
# RFLAGS = -r # RFLAGS = -r
# EXTLIBS = # EXTLIBS =
CC = $(CC) CC = $(CC)
AS = $(AS) !if "$(AS)" != "ml64"
AS = $(AS) -nologo
!endif
<< <<
!if "$(AS)" == "ml64"
@(findstr -r -c:"^MACHINE *= *x86" $(MAKEFILE) > nul && \
(echo AS = $(AS:64=) -nologo) || \
(echo AS = $(AS) -nologo) ) >>$(MAKEFILE)
!endif
@(for %I in (cl.exe) do @set MJIT_CC=%~$$PATH:I) && (call echo MJIT_CC = "%MJIT_CC:\=/%" -nologo>>$(MAKEFILE)) @(for %I in (cl.exe) do @set MJIT_CC=%~$$PATH:I) && (call echo MJIT_CC = "%MJIT_CC:\=/%" -nologo>>$(MAKEFILE))
@type << >>$(MAKEFILE) @type << >>$(MAKEFILE)