]>
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 |
1c3d4237 | 11 | --- ruby-2.2.5/common.mk.orig 2016-03-29 23:07:26.000000000 +0200 |
12 | +++ ruby-2.2.5/common.mk 2016-09-19 14:02:16.189655531 +0200 | |
13 | @@ -186,7 +186,7 @@ | |
44b97f26 ER |
14 | configure-ext: $(EXTS_MK) |
15 | ||
16 | build-ext: $(EXTS_MK) | |
1c3d4237 | 17 | - $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ |
18 | + $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) CC="$(CC)" \ | |
19 | ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) | |
44b97f26 | 20 | |
1c3d4237 | 21 | prog: program wprogram |
22 | @@ -598,7 +598,7 @@ | |
44b97f26 ER |
23 | $(ECHO) making $@ |
24 | $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \ | |
25 | RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \ | |
26 | - $(MFLAGS) $@ | |
27 | + $(MFLAGS) CC="$(CC)" $@ | |
28 | ||
29 | ||
30 | libenc enc: {$(VPATH)}encdb.h | |
1c3d4237 | 31 | @@ -737,7 +737,7 @@ |
44b97f26 ER |
32 | |
33 | srcs-enc: $(ENC_MK) | |
34 | $(ECHO) making srcs under enc | |
35 | - $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs | |
36 | + $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" CC="$(CC)" $(MFLAGS) srcs | |
37 | ||
1c3d4237 | 38 | all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h |
39 | incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \ |