]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: version: put the compiler version output into version.c not haproxy.c
authorWilly Tarreau <w@1wt.eu>
Tue, 16 Jun 2020 17:11:11 +0000 (19:11 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 16 Jun 2020 17:11:11 +0000 (19:11 +0200)
For an unknown reason in commit bb1b63c079 I placed the compiler version
output in haproxy.c instead of version.c. Better have it in version.c which
is more suitable to this sort of things.

src/haproxy.c
src/version.c

index 215c68a3032f76b9661fe702de5cbdd7a68b61b2..22c2fe54513a2344e38a5c2e512e18a3dda052f7 100644 (file)
@@ -3773,12 +3773,6 @@ int main(int argc, char **argv)
        deinit_and_exit(0);
 }
 
-#if defined(__clang_version__)
-REGISTER_BUILD_OPTS("Built with clang compiler version " __clang_version__);
-#elif defined(__VERSION__)
-REGISTER_BUILD_OPTS("Built with gcc compiler version " __VERSION__);
-#endif
-
 /*
  * Local variables:
  *  c-indent-level: 8
index 99a85776f6851213391b2994458e5a14822f492a..135ff8d06005b99e0dcb8a29d4b523bc7d702fec 100644 (file)
@@ -13,3 +13,9 @@ char haproxy_version_here[] = "HAProxy version follows";
 char haproxy_version[]      = HAPROXY_VERSION;
 char haproxy_date[]         = HAPROXY_DATE;
 char stats_version_string[] = STATS_VERSION_STRING;
+
+#if defined(__clang_version__)
+REGISTER_BUILD_OPTS("Built with clang compiler version " __clang_version__);
+#elif defined(__VERSION__)
+REGISTER_BUILD_OPTS("Built with gcc compiler version " __VERSION__);
+#endif