diff options
| author | Nobuyoshi Nakada <[email protected]> | 2023-10-19 20:23:58 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2023-11-09 16:01:01 +0900 |
| commit | 22939382a897af32d9899fafedd5be807b0d555b () | |
| tree | 21003eb21b6eef945505b6e2776d4dbe5d3df19c | |
| parent | e2ef85b1090d8806f6b68e2fa93d929d02e543b5 (diff) | |
[Bug #18286] Make builtin binary if sharable in universal binaries
| -rw-r--r-- | builtin.c | 6 | ||||
| -rw-r--r-- | common.mk | 7 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | template/Makefile.in | 1 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 31 insertions, 6 deletions
@@ -3,15 +3,15 @@ #include "iseq.h" #include "builtin.h" -#ifdef CROSS_COMPILING #define INCLUDED_BY_BUILTIN_C 1 #include "mini_builtin.c" #else -#include "builtin_binary.inc" - static const unsigned char * bin4feature(const struct builtin_binary *bb, const char *feature, size_t *psize) { @@ -1301,9 +1301,12 @@ preludes: {$(srcdir)}golf_prelude.c $(ECHO) making $@ $(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $< -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) $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb @@ -1489,6 +1489,25 @@ RUBY_CHECK_SIZEOF(float) RUBY_CHECK_SIZEOF(double) RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>]) RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>]) AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct, [rb_cv_packed_struct=no @@ -4482,7 +4501,7 @@ guard=INCLUDE_RUBY_CONFIG_H { echo "#ifndef $guard" echo "#define $guard 1" - grep -v "^#define PACKAGE_" confdefs.h echo "#endif /* $guard */" } | tr -d '\015' | ( @@ -65,6 +65,7 @@ rubyarchhdrdir = @rubyarchhdrdir@ ruby_version = @ruby_version@ RUBY_VERSION_NAME = @RUBY_VERSION_NAME@ UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@ TESTUI = console TESTS = @@ -433,8 +433,10 @@ THREAD_IMPL_SRC = thread_$(THREAD_MODEL).c !if "$(CROSS_COMPILING)" == "yes" PREP = $(arch)-fake.rb !else PREP = miniruby$(EXEEXT) !endif !if !defined(EXTSTATIC) |