2173609d13
This avoids problem with cpp in the NDK which is provided by gcc and does not understand clang specific flags (e.g. -Oz).
22 lines
770 B
Diff
22 lines
770 B
Diff
diff -u -r ../ruby-2.4.1/lib/mkmf.rb ./lib/mkmf.rb
|
|
--- ../ruby-2.4.1/lib/mkmf.rb 2017-03-11 19:46:17.000000000 +0100
|
|
+++ ./lib/mkmf.rb 2017-08-21 01:04:18.918432148 +0200
|
|
@@ -500,7 +500,7 @@
|
|
if $universal and (arch_flag = conf['ARCH_FLAG']) and !arch_flag.empty?
|
|
conf['ARCH_FLAG'] = arch_flag.gsub(/(?:\G|\s)-arch\s+\S+/, '')
|
|
end
|
|
- RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
|
|
+ RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #{opt} #{CONFTEST_C} #{outfile}",
|
|
conf)
|
|
end
|
|
|
|
@@ -1894,7 +1894,7 @@
|
|
vpath = $VPATH.dup
|
|
CONFIG["hdrdir"] ||= $hdrdir
|
|
mk << %{
|
|
-SHELL = /bin/sh
|
|
+SHELL = @TERMUX_PREFIX@/bin/sh
|
|
|
|
# V=0 quiet, V=1 verbose. other values don't work.
|
|
V = 0
|