diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-01 22:49:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-01 22:49:26 +0000 |
| commit | f6ff45ceb3047cb6b826b5868649b883d6b814b0 (patch) | |
| tree | 64e7c336ec8e18ea9466d366e020b89729618e10 | |
| parent | 5fa3c57e2f374aeaac766132e182dab4d6ae9315 (diff) | |
MJIT specific flags
Passing options to configure like as `configure MJIT_OPTFLAGS=-O
MJIT_DEBUGFLAGS=-g` overrides options to be used to compile JIT
code, separately from the default options to be used for ruby
itself.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 15 |
3 files changed, 21 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 64faaa8578..9ddb488850 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,9 @@ MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@ MJIT_HEADER_SUFFIX = MJIT_HEADER_ARCH = MJIT_HEADER_INSTALL_DIR = @MJIT_HEADER_INSTALL_DIR@ +MJIT_CC = @MJIT_CC@ +MJIT_OPTFLAGS = @MJIT_OPTFLAGS@ +MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXTLDFLAGS = @EXTLDFLAGS@ XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) @@ -556,10 +559,10 @@ mjit_config.h: sep=; \ quote MJIT_HEADER_INSTALL_DIR "$(MJIT_HEADER_INSTALL_DIR)"; \ sep=,; \ - quote "MJIT_CC_COMMON " $(CC); \ + quote "MJIT_CC_COMMON " $(MJIT_CC); \ quote "MJIT_CFLAGS " -w $(ARCH_FLAG); \ - quote "MJIT_OPTFLAGS " $(optflags); \ - quote "MJIT_DEBUGFLAGS " $(debugflags); \ + quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ + quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ quote "MJIT_LDSHARED " @LDSHARED@; \ quote "MJIT_DLDFLAGS " @DLDFLAGS@; \ quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ diff --git a/configure.ac b/configure.ac index 6c40134c3b..cc1776fa15 100644 --- a/configure.ac +++ b/configure.ac @@ -2459,6 +2459,9 @@ AC_SUBST(DLDFLAGS)dnl AC_SUBST(ARCH_FLAG)dnl AC_SUBST(MJIT_HEADER_FLAGS)dnl AC_SUBST(MJIT_HEADER_INSTALL_DIR)dnl +AC_SUBST(MJIT_CC, [${MJIT_CC-'$(CC)'}])dnl +AC_SUBST(MJIT_OPTFLAGS, [${MJIT_OPTFLAGS-'$(optflags)'}])dnl +AC_SUBST(MJIT_DEBUGFLAGS, [${MJIT_DEBUGFLAGS-'$(debugflags)'}])dnl AC_SUBST(STATIC)dnl AC_SUBST(CCDLFLAGS)dnl diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0cb1b6ba21..8673c12164 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -301,6 +301,15 @@ MJIT_HEADER_FLAGS = -P MJIT_HEADER_SUFFIX = MJIT_HEADER_ARCH = MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch) +!ifndef MJIT_CC +MJIT_CC = $(CC) +!endif +!ifndef MJIT_OPTFLAGS +MJIT_OPTFLAGS = $(OPTFLAGS) +!endif +!ifndef MJIT_DEBUGFLAGS +MJIT_DEBUGFLAGS = $(DEBUGFLAGS) +!endif DLDFLAGS = $(LDFLAGS) -dll SOLIBS = @@ -1262,7 +1271,7 @@ mjit_config.h: <<KEEP @ @(set sep=#define MJIT_CC_COMMON ) & \ - for %I in ($(CC)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ + for %I in ($(MJIT_CC)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ @echo /* MJIT_CC_COMMON */>> $@ @ @(set sep=#define MJIT_CFLAGS ) & \ @@ -1270,11 +1279,11 @@ mjit_config.h: @echo /* MJIT_CFLAGS */>> $@ @ @(set sep=#define MJIT_OPTFLAGS ) & \ - for %I in ($(OPTFLAGS)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ + for %I in ($(MJIT_OPTFLAGS)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ @echo /* MJIT_OPTFLAGS */>> $@ @ @(set sep=#define MJIT_DEBUGFLAGS ) & \ - for %I in ($(DEBUGFLAGS)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ + for %I in ($(MJIT_DEBUGFLAGS)) do @(call echo.%%sep%%"%%~I", \& set sep= ) >> $@ @echo /* MJIT_DEBUGFLAGS */>> $@ @ @(set sep=#define MJIT_LDSHARED ) & \ |