aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-02-27 12:01:53 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-02-27 12:01:53 +0200
commitcb9077357d4680ece6ec9014cb41e15274629fe8 (patch)
tree5ed728420555c1dc8a0892960ba5bc43f95ec8af /libbuild2/cc
parente739980bf78021f6021e9d56faff773c72791af9 (diff)
Minor code clanup
Diffstat (limited to 'libbuild2/cc')
-rw-r--r--libbuild2/cc/pkgconfig.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index e71e585..64dd9ca 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -178,13 +178,12 @@ namespace build2
// Also disable merging options like -framework into a single fragment, if
// possible.
//
-#ifdef PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS
static const int pkgconf_flags =
- PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS |
- PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS;
-#else
- static const int pkgconf_flags = PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS;
+ PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS
+#ifdef PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS
+ | PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS
#endif
+ ;
static bool
pkgconf_error_handler (const char* msg, const pkgconf_client_t*, const void*)