From d89d1d468779ccea52d9b8da4f9d967543d28723 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Mon, 14 Jan 2019 05:50:13 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- mjit_worker.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mjit_worker.c b/mjit_worker.c index 9faeb100d8..b69fe1e1bf 100644 --- a/mjit_worker.c +++ b/mjit_worker.c @@ -268,14 +268,14 @@ static const char *const CC_DLDFLAGS_ARGS[] = { }; 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 };