diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-22 00:02:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-22 00:02:56 +0000 |
| commit | 243a8600d5ee4642945e1407a3454ef16bbeee8d (patch) | |
| tree | 86d31ca7fa4bc7e89ad86cb95e4f74d4962734b1 /Makefile.in | |
| parent | 9b826431edfc0634109fac86d862d7a7b715f939 (diff) | |
| download | ruby-243a8600d5ee4642945e1407a3454ef16bbeee8d.tar.gz | |
Makefile.in: MJIT_ARCHFLAG
* Makefile.in (mjit_config.h): separate MJIT_ARCHFLAG for each
architecture on universal binary. cannot use precompiled-header
with multiple -arch options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 62fea44052..4dc0178e12 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,6 +46,7 @@ sitedir = @sitedir@ archlibdir = @archlibdir@ ruby_version = @ruby_version@ RUBY_VERSION_NAME = @RUBY_VERSION_NAME@ +UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@ TESTUI = console TESTS = @@ -555,6 +556,7 @@ mjit_config.h: $${1+printf} $${1+' "%s"'$$sep} $${1+"$$@"}; \ echo; \ }; \ + archs="$(UNIVERSAL_ARCHNAMES)"; \ test "$(Q)" = @ || set -x; \ echo '#ifndef RUBY_MJIT_CONFIG_H'; \ echo '#define RUBY_MJIT_CONFIG_H 1'; \ @@ -563,12 +565,18 @@ mjit_config.h: quote MJIT_HEADER_INSTALL_DIR "$(MJIT_HEADER_INSTALL_DIR)"; \ sep=,; \ quote "MJIT_CC_COMMON " $(MJIT_CC); \ - quote "MJIT_CFLAGS " -w $(ARCH_FLAG); \ + quote "MJIT_CFLAGS $${archs:+ MJIT_ARCHFLAG}" -w; \ quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ quote "MJIT_DLDFLAGS " @DLDFLAGS@; \ quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ + $${archs:+echo} $${archs:+'#if 0'}; \ + for arch in $$archs; do \ + echo "#elif defined __$${arch%=*}__"; \ + quote " MJIT_ARCHFLAG " -arch $${arch%=*}; \ + done; \ + $${archs:+echo} $${archs:+'#endif'}; \ echo; \ echo '#endif /* RUBY_MJIT_CONFIG_H */'; \ } > $@ |