From 71385538d2b272934b1a1881bd19effe9374591f Mon Sep 17 00:00:00 2001 From: k0kubun Date: Sun, 11 Feb 2018 12:50:23 +0000 Subject: [PATCH] Makefile.in: define macro in one line Having macro definition in multiple definitions makes compiler error output hard to read, like the commit message of r62367. Probably build failures will be fixed by r62370, but let me simplify the mjit_config.h content for future debugging. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index 79c2f05263..f94d64f515 100644 --- a/Makefile.in +++ b/Makefile.in @@ -542,30 +542,29 @@ mjit_config.h: echo '#ifndef RUBY_MJIT_CONFIG_H'; \ echo '#define RUBY_MJIT_CONFIG_H 1'; \ \ - set x $(CC) && shift && echo '#define MJIT_CC_COMMON' \\ && \ - for w do echo ' "'$$w'",' \\ ; done; \ - echo ' /* MJIT_CC_COMMON */'; \ + set x $(CC) && shift && echo -n '#define MJIT_CC_COMMON ' && \ + for w do echo -n '"'$$w'", '; done; \ + echo; \ \ - set x -w $(ARCH_FLAG) && shift && echo '#define MJIT_CFLAGS' \\ && \ - for w do echo ' "'$$w'",' \\ ; done; \ - echo ' /* MJIT_CFLAGS */'; \ + set x -w $(ARCH_FLAG) && shift && echo -n '#define MJIT_CFLAGS ' && \ + for w do echo -n '"'$$w'", '; done; \ + echo; \ \ - set x $(optflags) && shift && echo '#define MJIT_OPTFLAGS' \\ && \ - for w do echo ' "'$$w'",' \\ ; done; \ - echo ' /* MJIT_OPTFLAGS */'; \ + set x $(optflags) && shift && echo -n '#define MJIT_OPTFLAGS ' && \ + for w do echo -n '"'$$w'", '; done; \ + echo; \ \ - set x $(debugflags) && shift && echo '#define MJIT_DEBUGFLAGS' \\ && \ - for w do echo ' "'$$w'",' \\ ; done; \ - echo ' /* MJIT_DEBUGFLAGS */'; \ + set x $(debugflags) && shift && echo -n '#define MJIT_DEBUGFLAGS ' && \ + for w do echo -n '"'$$w'", '; done; \ + echo; \ \ - set x @LDSHARED@ && shift && echo '#define MJIT_LDSHARED' \\ && \ - for w do echo ' "'$$w'",' \\ ; done; \ - echo ' /* MJIT_LDSHARED */'; \ + set x @LDSHARED@ && shift && echo -n '#define MJIT_LDSHARED ' && \ + for w do echo -n '"'$$w'", '; done; \ + echo; \ \ - set x @DLDFLAGS@ && shift && echo '#define MJIT_DLDFLAGS' \\ && \ - for w do echo ' "'$$w'",' \\ ; done; \ - echo ' /* MJIT_DLDFLAGS */'; \ + set x @DLDFLAGS@ && shift && echo -n '#define MJIT_DLDFLAGS ' && \ + for w do echo -n '"'$$w'", '; done; \ + echo; \ \ echo '#endif /* RUBY_MJIT_CONFIG_H */'; \ } > $@ - cat $@ # debugging