Skip to content

Commit

Permalink
DAOS-15136 build: Refine static libfuse building. (daos-stack#13789)
Browse files Browse the repository at this point in the history
Move the scons code to a common place and add dl library.

Signed-off-by: Ashley Pittman <[email protected]>
  • Loading branch information
ashleypittman authored Feb 13, 2024
1 parent da2816e commit 466cb1a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 0 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ def parse_and_save_conf(env, opts_file):
opts.Add(EnumVariable('SCONS_ENV', "Default SCons environment inheritance",
'minimal', ['minimal', 'full'], ignorecase=2))

opts.Add(BoolVariable('STATIC_FUSE', "Build with static libfuse library", 0))

opts.Add('GO_BIN', 'Full path to go binary', None)

opts.Add(PathVariable('ENV_SCRIPT', "Location of environment script",
Expand Down
5 changes: 3 additions & 2 deletions site_scons/prereq_tools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,9 @@ def __init__(self, env, opts):
PathVariable.PathIsDirCreate))
opts.Add('USE_INSTALLED', 'Comma separated list of preinstalled dependencies', 'none')
opts.Add(('MPI_PKG', 'Specifies name of pkg-config to load for MPI', None))
opts.Add(BoolVariable('FIRMWARE_MGMT', 'Build in device firmware management.', 0))
opts.Add(BoolVariable('STACK_MMAP', 'Allocate ABT ULTs stacks with mmap()', 0))
opts.Add(BoolVariable('FIRMWARE_MGMT', 'Build in device firmware management.', False))
opts.Add(BoolVariable('STACK_MMAP', 'Allocate ABT ULTs stacks with mmap()', False))
opts.Add(BoolVariable('STATIC_FUSE', "Build with static libfuse library", False))
opts.Add(EnumVariable('BUILD_TYPE', "Set the build type", 'release',
['dev', 'debug', 'release'], ignorecase=1))
opts.Add(EnumVariable('TARGET_TYPE', "Set the prerequisite type", 'default',
Expand Down
2 changes: 1 addition & 1 deletion src/client/dfuse/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def scons():
else:
cenv.require('fuse')
static_fuse = []
extra_libs = []
extra_libs = ['dl']

configure_fuse(cenv)

Expand Down

0 comments on commit 466cb1a

Please sign in to comment.