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

ruby-changes:54596

From: k0kubun <ko1@a...>
Date: Mon, 14 Jan 2019 14:50:19 +0900 (JST)
Subject: [ruby-changes:54596] k0kubun:r66811 (trunk): mjit_worker.c: untangle CC_LIBS nesting

k0kubun	2019-01-14 14:50:13 +0900 (Mon, 14 Jan 2019)

  New Revision: 66811

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

  Log:
    mjit_worker.c: untangle CC_LIBS nesting
    
    This should have no impact.
    The CC_LIBS was too hard to read for human.
    
    I don't remember whether the order of -lmsvcrt and -lgcc matters or not,
    but I kept that for the best safety.

  Modified files:
    trunk/mjit_worker.c
Index: mjit_worker.c
===================================================================
--- mjit_worker.c	(revision 66810)
+++ mjit_worker.c	(revision 66811)
@@ -268,14 +268,14 @@ static const char *const CC_DLDFLAGS_ARG https://github.com/ruby/ruby/blob/trunk/mjit_worker.c#L268
 };
 
 static const char *const CC_LIBS[] = {
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__) // mswin, mingw, cygwin
     MJIT_LIBS
-# if defined __GNUC__ && !defined __clang__
-#  if defined(_WIN32)
+#endif
+#if defined(_WIN32) && defined __GNUC__ && !defined __clang__ // mingw
     "-lmsvcrt",
-#  endif
+#endif
+#if (defined(_WIN32) || defined(__CYGWIN__)) && defined __GNUC__ && !defined __clang__ // mingw, cygwin
     "-lgcc",
-# endif
 #endif
     NULL
 };

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

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