Skip to content

Commit 8182021

Browse files
committed
build: align configure with nix tools
1 parent 80d452a commit 8182021

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

configure.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,11 +1805,11 @@ def configure_abseil(build_dir, mode, mode_config):
18051805

18061806
def query_seastar_flags(pc_file, use_shared_libs, link_static_cxx=False):
18071807
if use_shared_libs:
1808-
opt = '--shared'
1808+
opts = []
18091809
else:
1810-
opt = '--static'
1811-
cflags = pkg_config(pc_file, '--cflags', opt)
1812-
libs = pkg_config(pc_file, '--libs', opt)
1810+
opts = ['--static']
1811+
cflags = pkg_config(pc_file, '--cflags', *opts)
1812+
libs = pkg_config(pc_file, '--libs', *opts)
18131813
if use_shared_libs:
18141814
rpath = os.path.dirname(libs.split()[0])
18151815
libs = f"-Wl,-rpath='{rpath}' {libs}"

flake.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
diffutils
126126
doxygen
127127
colordiff
128+
wabt
128129
];
129130
}
130131
else

0 commit comments

Comments
 (0)