Skip to content

Commit

Permalink
Let non-add-on preconfigure scripts set libc_config_ok.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland McGrath committed Apr 9, 2015
1 parent b0b88ab commit 0543929
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2015-04-09 Roland McGrath <roland@hack.frob.com>

* configure.ac (libc_config_ok): Initialize before reading
preconfigure scripts, not after.
* configure: Regenerated.

* test-skeleton.c (TIMEOUT): Move #define to top level.
(main): Grok environment variable TEST_DIRECT. If set, print
test expectation details into that file and then behave as if
Expand Down
7 changes: 4 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3878,6 +3878,10 @@ if test "${with_cpu+set}" = set; then :
fi


# An preconfigure script can set this when it wants to disable the sanity
# check below.
libc_config_ok=no

if frags=`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null`
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysdeps preconfigure fragments" >&5
Expand All @@ -3891,9 +3895,6 @@ $as_echo_n "checking for sysdeps preconfigure fragments... " >&6; }
$as_echo "" >&6; }
fi

# An add-on can set this when it wants to disable the sanity check below.
libc_config_ok=no

subdirs="$subdirs "


Expand Down
7 changes: 4 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,13 @@ AC_ARG_WITH([cpu],
esac
])

# An preconfigure script can set this when it wants to disable the sanity
# check below.
libc_config_ok=no

dnl Let sysdeps/*/preconfigure act here, like they can in add-ons.
LIBC_PRECONFIGURE([$srcdir], [for sysdeps])

# An add-on can set this when it wants to disable the sanity check below.
libc_config_ok=no

dnl Having this here, though empty, makes sure that if add-ons' fragments
dnl do AC_CONFIG_SUBDIRS([some-dir]), which just sets $subdirs, then
dnl our AC_OUTPUT will actually use it.
Expand Down

0 comments on commit 0543929

Please sign in to comment.