Commit 3d3e9b9c authored by Rusty Russell's avatar Rusty Russell

tools/configurator: set HAVE_CLOCK_GETTIME even if it's in -lrt.

This avoids conflicts with autoconf and other config.h sources.

Based on the work by Cody P Schafer <dev@codyps.com>.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 7220240c
...@@ -55,6 +55,7 @@ struct test { ...@@ -55,6 +55,7 @@ struct test {
const char *depends; const char *depends;
const char *link; const char *link;
const char *fragment; const char *fragment;
const char *overrides; /* On success, force this to '1' */
bool done; bool done;
bool answer; bool answer;
}; };
...@@ -144,7 +145,9 @@ static struct test tests[] = { ...@@ -144,7 +145,9 @@ static struct test tests[] = {
" struct timespec ts;\n" " struct timespec ts;\n"
" clock_gettime(CLOCK_REALTIME, &ts);\n" " clock_gettime(CLOCK_REALTIME, &ts);\n"
" return ts;\n" " return ts;\n"
"}\n" }, "}\n",
/* This means HAVE_CLOCK_GETTIME, too */
"HAVE_CLOCK_GETTIME" },
{ "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL, { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL,
"int *foo = (int[]) { 1, 2, 3, 4 };\n" "int *foo = (int[]) { 1, 2, 3, 4 };\n"
"return foo[0] ? 0 : 1;" }, "return foo[0] ? 0 : 1;" },
...@@ -479,6 +482,12 @@ static bool run_test(const char *cmd, struct test *test) ...@@ -479,6 +482,12 @@ static bool run_test(const char *cmd, struct test *test)
test->answer = (status == 0); test->answer = (status == 0);
} }
test->done = true; test->done = true;
if (test->answer && test->overrides) {
struct test *override = find_test(test->overrides);
override->done = true;
override->answer = true;
}
return test->answer; return test->answer;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment