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

ruby-changes:57251

From: Yusuke <ko1@a...>
Date: Sun, 25 Aug 2019 23:10:58 +0900 (JST)
Subject: [ruby-changes:57251] Yusuke Endoh: 365e5b38a9 (master): configure.ac: Improve icc_version guessing for non-icc environment

https://git.ruby-lang.org/ruby.git/commit/?id=365e5b38a9

From 365e5b38a9ca24116a9c3133e0a0e8ce230ccb02 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Sun, 25 Aug 2019 23:08:13 +0900
Subject: configure.ac: Improve icc_version guessing for non-icc environment

icc_version was wrongly defined as "__ICC" on non-icc C compiler, which
caused a warning:

```
./configure: line 8211: test: __ICC: integer expression expected
```

This change adds a sed commend to delete "__ICC".

diff --git a/configure.ac b/configure.ac
index cd9f039..cb3553b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ AS_IF([test "$GCC" = yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L239
     gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
     test -n "$gcc_major" || gcc_major=0
     test -n "$gcc_minor" || gcc_minor=0
-    icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///'`
+    icc_version=`echo =__ICC | $CC -E -xc - | sed '/^=/!d;s///;/^__ICC/d'`
     test -n "$icc_version" || icc_version=0
     # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
 ], [
-- 
cgit v0.10.2


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

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