From 1a5470e95b8180c23d0c51062393f1a5ea419abb Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 4 Feb 2018 13:33:13 +0000 Subject: [PATCH] Makefile.sub: CFLAGS_NO_ARCH * win32/Makefile.sub: split CFLAGS into CFLAGS_NO_ARCH and ARCH_FLAG, as well as Makefile.in. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 3013fbe576..5986b2c97d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -228,8 +228,14 @@ WARNFLAGS = -W2 !endif !endif WERRORFLAG = -WX +!if !defined(CFLAGS_NO_ARCH) +CFLAGS_NO_ARCH = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(COMPILERFLAG) +!endif +!if !defined(ARCH_FLAG) +ARCH_FLAG = $(PROCESSOR_FLAG) +!endif !if !defined(CFLAGS) -CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) $(COMPILERFLAG) +CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG) !endif !if !defined(CXXFLAGS) CXXFLAGS = $(CFLAGS)