kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use toodir also in configure.ac

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-04-05 10:56:28 +09:00
parent 4a6571dbc1
commit 4f938ffa35
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -6,6 +6,8 @@ AC_CONFIG_MACRO_DIRS(tool/m4)
AC_PREREQ(2.67) AC_PREREQ(2.67)
tooldir="$srcdir/tool"
dnl override AC_CHECKING dnl override AC_CHECKING
dnl placed here due to aclocal(1)'s dnl placed here due to aclocal(1)'s
dnl ignoring this definition in separate files dnl ignoring this definition in separate files
@ -294,7 +296,7 @@ AS_CASE(["$build_os"],
echo 'int main(void) {return 0;}' > conftest.c echo 'int main(void) {return 0;}' > conftest.c
AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 | AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 |
grep '^ld: warning: text-based stub file' >/dev/null], [ grep '^ld: warning: text-based stub file' >/dev/null], [
CC_WRAPPER=`cd -P "$srcdir/tool" && pwd`/darwin-cc CC_WRAPPER=`cd -P "${tooldir}" && pwd`/darwin-cc
CC="$CC_WRAPPER $CC" CC="$CC_WRAPPER $CC"
]) ])
rm -fr conftest* rm -fr conftest*
@ -3949,7 +3951,7 @@ guard=INCLUDE_RUBY_CONFIG_H
} | tr -d '\015' | } | tr -d '\015' |
( (
AS_IF([test "x$CONFIGURE_TTY" = xyes], [color=--color], [color=]) AS_IF([test "x$CONFIGURE_TTY" = xyes], [color=--color], [color=])
exec ${srcdir}/tool/ifchange $color "${config_h}" - exec ${tooldir}/ifchange $color "${config_h}" -
) >&AS_MESSAGE_FD || AC_MSG_ERROR([failed to create ${config_h}]) ) >&AS_MESSAGE_FD || AC_MSG_ERROR([failed to create ${config_h}])
tr -d '\015' < largefile.h > confdefs.h tr -d '\015' < largefile.h > confdefs.h
rm largefile.h rm largefile.h