ruby-changes:60657
From: Nobuyoshi <ko1@a...>
Date: Sun, 5 Apr 2020 10:56:56 +0900 (JST)
Subject: [ruby-changes:60657] 4f938ffa35 (master): Use toodir also in configure.ac
https://git.ruby-lang.org/ruby.git/commit/?id=4f938ffa35 From 4f938ffa35f5770af73d55e679f9524e032cbfc3 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 5 Apr 2020 10:56:28 +0900 Subject: Use toodir also in configure.ac diff --git a/configure.ac b/configure.ac index b1a7797..9544e45 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,8 @@ AC_CONFIG_MACRO_DIRS(tool/m4) https://github.com/ruby/ruby/blob/trunk/configure.ac#L6 AC_PREREQ(2.67) +tooldir="$srcdir/tool" + dnl override AC_CHECKING dnl placed here due to aclocal(1)'s dnl ignoring this definition in separate files @@ -294,7 +296,7 @@ AS_CASE(["$build_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L296 echo 'int main(void) {return 0;}' > conftest.c AS_IF([$CC -framework Foundation -o conftest conftest.c 2>&1 | 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" ]) rm -fr conftest* @@ -3949,7 +3951,7 @@ guard=INCLUDE_RUBY_CONFIG_H https://github.com/ruby/ruby/blob/trunk/configure.ac#L3951 } | tr -d '\015' | ( 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}]) tr -d '\015' < largefile.h > confdefs.h rm largefile.h -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/