From cb9077357d4680ece6ec9014cb41e15274629fe8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 27 Feb 2020 12:01:53 +0200
Subject: Minor code clanup

---
 libbuild2/cc/pkgconfig.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'libbuild2/cc/pkgconfig.cxx')

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*)
-- 
cgit v1.1