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

ruby-changes:52869

From: nobu <ko1@a...>
Date: Mon, 15 Oct 2018 09:11:50 +0900 (JST)
Subject: [ruby-changes:52869] nobu:r65081 (trunk): Pass cflags given to configure to mjit

nobu	2018-10-15 09:11:45 +0900 (Mon, 15 Oct 2018)

  New Revision: 65081

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

  Log:
    Pass cflags given to configure to mjit

  Modified files:
    trunk/Makefile.in
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 65080)
+++ configure.ac	(revision 65081)
@@ -2525,6 +2525,7 @@ AC_SUBST(ARCH_FLAG)dnl https://github.com/ruby/ruby/blob/trunk/configure.ac#L2525
 AC_SUBST(MJIT_HEADER_FLAGS)dnl
 AC_SUBST(MJIT_HEADER_INSTALL_DIR)dnl
 AC_SUBST(MJIT_CC, [${MJIT_CC-'$(CC)'}])dnl
+AC_SUBST(MJIT_CFLAGS, [${MJIT_CFLAGS-"-w ${orig_cflags}"}])dnl
 AC_SUBST(MJIT_OPTFLAGS, [${MJIT_OPTFLAGS-'$(optflags)'}])dnl
 AC_SUBST(MJIT_DEBUGFLAGS, [${MJIT_DEBUGFLAGS-'$(debugflags)'}])dnl
 AC_SUBST(MJIT_LDSHARED)dnl
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65080)
+++ Makefile.in	(revision 65081)
@@ -81,6 +81,7 @@ MJIT_HEADER_SUFFIX = https://github.com/ruby/ruby/blob/trunk/Makefile.in#L81
 MJIT_HEADER_ARCH =
 MJIT_HEADER_INSTALL_DIR = @MJIT_HEADER_INSTALL_DIR@
 MJIT_CC = @MJIT_CC@
+MJIT_CFLAGS = @MJIT_CFLAGS@
 MJIT_OPTFLAGS = @MJIT_OPTFLAGS@
 MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@
 MJIT_LDSHARED = @MJIT_LDSHARED@
@@ -607,7 +608,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L608
 	quote MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)"; \
 	sep=,; \
 	quote "MJIT_CC_COMMON  " $(MJIT_CC); \
-	quote "MJIT_CFLAGS     $${need_mjit_archflag:+ MJIT_ARCHFLAG}" -w; \
+	quote "MJIT_CFLAGS     $${need_mjit_archflag:+ MJIT_ARCHFLAG}" $(MJIT_CFLAGS); \
 	quote "MJIT_OPTFLAGS   " $(MJIT_OPTFLAGS); \
 	quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
 	quote "MJIT_LDSHARED   " $(MJIT_LDSHARED); \

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

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