summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-28 01:04:38 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-28 01:04:38 (GMT)
commitdb67f542dc4d843023947bab23cef029ff039f43 (patch)
treec69172ac97ef34bbe078a3c3daaade05f85d3da5 /win32
parent97a8334cd301fa1cdde12fb44a54da573e2a9aef (diff)
win32/Makefile.sub: add flags for AS
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub4
-rw-r--r--win32/setup.mak6
2 files changed, 6 insertions, 4 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 9157ea5..7ac6c6e 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 2b9c355..eb99c6e 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)