Commit | Line | Data |
---|---|---|
07176222 FF |
1 | diff -u -r ../ruby-2.4.1/lib/mkmf.rb ./lib/mkmf.rb |
2 | --- ../ruby-2.4.1/lib/mkmf.rb 2017-03-11 19:46:17.000000000 +0100 | |
3 | +++ ./lib/mkmf.rb 2017-08-21 01:04:18.918432148 +0200 | |
4 | @@ -500,7 +500,7 @@ | |
5 | if $universal and (arch_flag = conf['ARCH_FLAG']) and !arch_flag.empty? | |
6 | conf['ARCH_FLAG'] = arch_flag.gsub(/(?:\G|\s)-arch\s+\S+/, '') | |
7 | end | |
8 | - RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", | |
9 | + RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #{opt} #{CONFTEST_C} #{outfile}", | |
10 | conf) | |
11 | end | |
12 | ||
13 | @@ -1894,7 +1894,7 @@ | |
59f0d218 FF |
14 | vpath = $VPATH.dup |
15 | CONFIG["hdrdir"] ||= $hdrdir | |
16 | mk << %{ | |
17 | -SHELL = /bin/sh | |
e0525b06 | 18 | +SHELL = @TERMUX_PREFIX@/bin/sh |
59f0d218 FF |
19 | |
20 | # V=0 quiet, V=1 verbose. other values don't work. | |
21 | V = 0 |