]>
Commit | Line | Data |
---|---|---|
1c3d4237 | 1 | --- ruby-2.2.5/tool/mkconfig.rb.orig 2016-09-19 13:53:05.152982868 +0200 |
2 | +++ ruby-2.2.5/tool/mkconfig.rb 2016-09-19 14:01:04.182988081 +0200 | |
3 | @@ -79,6 +79,7 @@ | |
4 | when /^LIBRUBY_D?LD/; next | |
5 | when /^RUBY_INSTALL_NAME$/; next vars[name] = (install_name = val).dup if $install_name | |
6 | when /^RUBY_SO_NAME$/; next vars[name] = (so_name = val).dup if $so_name | |
87688b10 | 7 | + when /^(CC|CXX)$/; val.sub!(/ccache /, '') |
45f22c60 ER |
8 | when /^arch$/; if val.empty? then val = arch else arch = val end |
9 | when /^sitearch$/; val = '$(arch)' if val.empty? | |
87688b10 | 10 | end |
e9fca6c2 ER |
11 | --- ruby-2.2.7/common.mk~ 2017-04-19 20:22:53.000000000 +0300 |
12 | +++ ruby-2.2.7/common.mk 2017-04-19 20:23:24.847180464 +0300 | |
67f26735 JR |
13 | @@ -66,7 +66,7 @@ |
14 | MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT) | |
15 | ENC_MK = enc.mk | |
16 | MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \ | |
17 | - RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) | |
18 | + RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) CC="$(CC)" | |
19 | ||
20 | COMMONOBJS = array.$(OBJEXT) \ | |
21 | bignum.$(OBJEXT) \ | |
1c3d4237 | 22 | @@ -186,7 +186,7 @@ |
44b97f26 ER |
23 | configure-ext: $(EXTS_MK) |
24 | ||
25 | build-ext: $(EXTS_MK) | |
1c3d4237 | 26 | - $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ |
27 | + $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) CC="$(CC)" \ | |
e9fca6c2 | 28 | EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) |
44b97f26 | 29 | |
1c3d4237 | 30 | prog: program wprogram |