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

ruby-changes:49160

From: naruse <ko1@a...>
Date: Fri, 15 Dec 2017 16:58:08 +0900 (JST)
Subject: [ruby-changes:49160] naruse:r61276 (trunk): check icc version inside condition

naruse	2017-12-15 16:58:02 +0900 (Fri, 15 Dec 2017)

  New Revision: 61276

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

  Log:
    check icc version inside condition

  Modified files:
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 61275)
+++ configure.ac	(revision 61276)
@@ -404,10 +404,12 @@ AS_IF([test "$GCC" = yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L404
     : ${optflags=-O3}
     gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
     gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
-    icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///'`
     test -n "$gcc_major" || gcc_major=0
     test -n "$gcc_minor" || gcc_minor=0
-    test -n "$icc_version" || icc_version=0
+    AS_CASE(["x$CC"], [xicc], [
+      icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///'`
+      test -n "$icc_version" || icc_version=0
+    ])
     # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
 ], [
     linker_flag=

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

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