diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2023-04-14 11:19:59 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2023-04-14 11:19:59 +0200 |
| commit | 233523e57e34f1ad263443bb4c12b57f1aef1aad (patch) | |
| tree | 5082400754e23d59e206a2ff86c25bc82456cb88 | |
| parent | b038abca63e64d73e64fee2c65fcc3f1743c2c4a (diff) | |
Remove global config.import.* workaround
| -rw-r--r-- | bpkg/pkg-configure.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 38aa01a..d6c5446 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -286,12 +286,9 @@ namespace bpkg else od = sp->effective_out_root (pdb.config); -#ifndef BPKG_OUTPROC_CONFIGURE - // @@ - // - // Use global overrides to recreate the original behavior of - // not warning about unused config.import.* variables - // (achived via the config.config.persist value in + // We tried to use global overrides to recreate the original + // behavior of not warning about unused config.import.* + // variables (achived via the config.config.persist value in // amalgamation). Even though it's probably misguided (we // don't actually save the unused values anywhere, just // don't warn about them). @@ -308,12 +305,8 @@ namespace bpkg // for the same package -- but it could be for a package // we are not configuring). // - vars.push_back ("!config.import." + sp->name.variable () + - "='" + od.representation () + '\''); -#else vars.push_back ("config.import." + sp->name.variable () + "='" + od.representation () + '\''); -#endif } } } |