[前][次][番号順一覧][スレッド一覧]

ruby-changes:50257

From: k0kubun <ko1@a...>
Date: Sun, 11 Feb 2018 23:39:04 +0900 (JST)
Subject: [ruby-changes:50257] k0kubun:r62375 (trunk): Makefile.in: prevent from building `"", ` macro

k0kubun	2018-02-11 23:38:54 +0900 (Sun, 11 Feb 2018)

  New Revision: 62375

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62375

  Log:
    Makefile.in: prevent from building `"",` macro
    
    Loop removal in r62373 caused the CI failure like:
    https://travis-ci.org/ruby/ruby/builds/340136977
    
    mjit_config.h was:
      #ifndef RUBY_MJIT_CONFIG_H
      #define RUBY_MJIT_CONFIG_H 1
      #define MJIT_CC_COMMON  "gcc",
      #define MJIT_CFLAGS  "-w",
      #define MJIT_OPTFLAGS  "-O3",
      #define MJIT_DEBUGFLAGS  "-ggdb3",
      #define MJIT_LDSHARED  "gcc", "-shared",
      #define MJIT_DLDFLAGS  "",
      #endif /* RUBY_MJIT_CONFIG_H */

  Modified files:
    trunk/Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 62374)
+++ Makefile.in	(revision 62375)
@@ -543,7 +543,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L543
 	echo '#define RUBY_MJIT_CONFIG_H 1'; \
 	\
 	printf '#define MJIT_CC_COMMON ' && \
-	printf ' "%s",' $(CC) && \
+	if test -n "$(CC)"; then printf ' "%s",' $(CC); fi && \
 	echo; \
 	\
 	printf '#define MJIT_CFLAGS ' && \
@@ -551,19 +551,19 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L551
 	echo; \
 	\
 	printf '#define MJIT_OPTFLAGS ' && \
-	printf ' "%s",' $(optflags) && \
+	if test -n "$(optflags)"; then printf ' "%s",' $(optflags); fi && \
 	echo; \
 	\
 	printf '#define MJIT_DEBUGFLAGS ' && \
-	printf ' "%s",' $(debugflags) && \
+	if test -n "$(debugflags)"; then printf ' "%s",' $(debugflags); fi && \
 	echo; \
 	\
 	printf '#define MJIT_LDSHARED ' && \
-	printf ' "%s",' @LDSHARED@ && \
+	if test -n "@LDSHARED@"; then printf ' "%s",' @LDSHARED@; fi && \
 	echo; \
 	\
 	printf '#define MJIT_DLDFLAGS ' && \
-	printf ' "%s",' @DLDFLAGS@ && \
+	if test -n "@DLDFLAGS@"; then printf ' "%s",' @DLDFLAGS@; fi && \
 	echo; \
 	\
 	echo '#endif /* RUBY_MJIT_CONFIG_H */'; \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]