diff options
| -rw-r--r-- | builtin.c | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | template/Makefile.in | 1 | ||||
| -rw-r--r-- | template/builtin_binary.inc.tmpl | 2 |
5 files changed, 6 insertions, 3 deletions
@@ -3,7 +3,7 @@ #include "iseq.h" #include "builtin.h" -#ifdef CROSS_COMPILING +#if defined(CROSS_COMPILING) || defined(UNIVERSAL_BINARY) #define INCLUDED_BY_BUILTIN_C 1 #include "mini_builtin.c" @@ -1303,7 +1303,7 @@ preludes: {$(srcdir)}golf_prelude.c builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/template/builtin_binary.inc.tmpl $(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ \ - $(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING) + $(srcdir)/template/builtin_binary.inc.tmpl -- --cross=$(CROSS_COMPILING) --universal=$(UNIVERSAL_BINARY) $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb diff --git a/configure.ac b/configure.ac index bf6d9af1f1..2ac47609fd 100644 --- a/configure.ac +++ b/configure.ac @@ -4367,6 +4367,8 @@ AS_IF([test "${universal_binary-no}" = yes ], [ AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}") AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-" RUBY_PLATFORM_OS) AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal." RUBY_PLATFORM_CPU "-" RUBY_PLATFORM_OS) + AC_DEFINE(UNIVERSAL_BINARY, 1) + AC_SUBST(UNIVERSAL_BINARY, yes) ], [ AS_IF([test "${target_os}-${rb_cv_msvcrt}" = "mingw32-ucrt" ], [ arch="${target_cpu}-mingw-ucrt" diff --git a/template/Makefile.in b/template/Makefile.in index 93fa02d9d7..e06834e4ca 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -65,6 +65,7 @@ rubyarchhdrdir = @rubyarchhdrdir@ ruby_version = @ruby_version@ RUBY_VERSION_NAME = @RUBY_VERSION_NAME@ UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@ +UNIVERSAL_BINARY = @UNIVERSAL_BINARY@ TESTUI = console TESTS = diff --git a/template/builtin_binary.inc.tmpl b/template/builtin_binary.inc.tmpl index 2c2f071705..86ea34970b 100644 --- a/template/builtin_binary.inc.tmpl +++ b/template/builtin_binary.inc.tmpl @@ -2,7 +2,7 @@ // DO NOT MODIFY THIS FILE DIRECTLY. // auto-generated file by tool/generic_erb.rb // with template/builtin_binary.inc.tmpl -% unless ARGV.include?('--cross=yes') +% unless ARGV.include?('--cross=yes') || ARGV.include?('--universal=yes') % ary = RubyVM.enum_for(:each_builtin).to_a % ary.each{|feature, iseq| |