diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-17 02:40:32 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-17 02:40:32 +0000 |
| commit | f0293ee6a93b3c95257d7db89bace2f6a207bae3 (patch) | |
| tree | f2d57d9e2447f444c7a2a907596b6f7c2ea2d10e /Makefile.in | |
| parent | 0c01b00c17a98badfb1496ae6558f75298787688 (diff) | |
| download | ruby-f0293ee6a93b3c95257d7db89bace2f6a207bae3.tar.gz | |
Makefile.in: MJIT_DLDFLAGS
* Makefile.in (mjit_config.h): needs -arch flag to link, as well
as precompiling the header, when compiling for i386 on x86_64
mac.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index d24d5a4187..a17881bd08 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,6 +81,7 @@ MJIT_CC = @MJIT_CC@ MJIT_OPTFLAGS = @MJIT_OPTFLAGS@ MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@ MJIT_LDSHARED = @MJIT_LDSHARED@ +MJIT_DLDFLAGS = @DLDFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXTLDFLAGS = @EXTLDFLAGS@ XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) @@ -558,6 +559,7 @@ mjit_config.h: echo; \ }; \ archs="$(UNIVERSAL_ARCHNAMES)"; \ + archs="$${archs:-$(ARCH_FLAG:-arch=)}"; \ test "$(Q)" = @ || set -x; \ echo '#ifndef RUBY_MJIT_CONFIG_H'; \ echo '#define RUBY_MJIT_CONFIG_H 1'; \ @@ -570,7 +572,7 @@ mjit_config.h: quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ - quote "MJIT_DLDFLAGS " @DLDFLAGS@; \ + quote "MJIT_DLDFLAGS $${archs:+ MJIT_ARCHFLAG}" $(MJIT_DLDFLAGS); \ quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ $${archs:+echo} $${archs:+'#if 0'}; \ for arch in $$archs; do \ |