From 89e1dbc3c8be25109293a5aa33a0d8a057a867ae Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 28 Nov 2017 11:23:42 +0100 Subject: [PATCH] bin: do not redefine argp_bug_address This prevented static compilation on MinGW. * bin/common_setup.cc: Here. --- bin/common_setup.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/common_setup.cc b/bin/common_setup.cc index 4d7c518e8..ac0b3f000 100644 --- a/bin/common_setup.cc +++ b/bin/common_setup.cc @@ -28,8 +28,6 @@ #include #include -const char* argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; - static void display_version(FILE *stream, struct argp_state*) { @@ -82,9 +80,12 @@ static void setup_sig_handler() void setup(char** argv) { + argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; + // Simplify the program name, because argp() uses it to report // errors and display help text. set_program_name(argv[0]); + argv[0] = const_cast(program_name); argp_program_version_hook = display_version;