From 81e019055618bd32638fe7a6da9ee2dd0c317379 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Jul 2022 10:59:38 +0200 Subject: Fix buildfile to avoid conditional dependency declarations --- bbot/buildfile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'bbot') diff --git a/bbot/buildfile b/bbot/buildfile index 66ec74a..1d9a409 100644 --- a/bbot/buildfile +++ b/bbot/buildfile @@ -21,22 +21,16 @@ import libs += libbbot%lib{bbot} # Agent is a systemd service. # -# @@ Have to package on Linux. -# -if ($cxx.target.class == "linux") -{ - ./: exe{bbot-agent} service{'bbot-agent@'} - - exe{bbot-agent}: agent/{hxx ixx txx cxx}{+agent} agent/libue{bbot} +./: exe{bbot-agent} \ + service{'bbot-agent@'}: include = ($cxx.target.class == 'linux') - agent/ - { - libue{bbot}: {hxx ixx txx cxx}{* -agent -agent-options -*.test...} \ - {hxx ixx cxx}{agent-options} \ - ../libue{bbot} - } +exe{bbot-agent}: agent/{hxx ixx txx cxx}{+agent} agent/libue{bbot} - cxx.libs += -ldl +agent/ +{ + libue{bbot}: {hxx ixx txx cxx}{* -agent -agent-options -*.test...} \ + {hxx ixx cxx}{agent-options} \ + ../libue{bbot} } ./: exe{bbot-worker}: worker/{hxx ixx txx cxx}{+worker} worker/libue{bbot} @@ -53,6 +47,9 @@ libue{bbot}: {hxx ixx txx cxx}{* -common-options -version -*.test...} \ {hxx}{version} \ $libs +if ($cxx.target.class == 'linux') + cxx.libs += -ldl + hxx{version}: in{version} $src_root/manifest # Unit tests. -- cgit v1.1