Skip to content

Commit

Permalink
build: stop including libboost_program_options
Browse files Browse the repository at this point in the history
libboost_program_options caused us a various problems such as
differences in visibility between versions (issue #1040),
significant code size (issue #980) and others, so in the
previous patches we removed all its uses in OSv and its
small utility applications (like cpiod and httpserver).
Now that it's no longer used, we can stop compiling it into
the kernel, or pretending (in elf.cc) that it is included
in the kernel.

Signed-off-by: Nadav Har'El <[email protected]>
Message-Id: <[email protected]>
  • Loading branch information
nyh authored and wkozaczuk committed Oct 4, 2019
1 parent a4e48ba commit 58fe5f2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1862,8 +1862,7 @@ else
boost-includes = -isystem $(miscbase)/usr/include
endif

boost-libs := $(boost-lib-dir)/libboost_program_options$(boost-mt).a \
$(boost-lib-dir)/libboost_system$(boost-mt).a
boost-libs := $(boost-lib-dir)/libboost_system$(boost-mt).a

ifeq ($(nfs), true)
nfs-lib = $(out)/libnfs.a
Expand Down
2 changes: 0 additions & 2 deletions core/elf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1154,12 +1154,10 @@ program::program(void* addr)
#ifdef __x86_64__
"ld-linux-x86-64.so.2",
"libboost_system.so.1.55.0",
"libboost_program_options.so.1.55.0",
#endif /* __x86_64__ */
#ifdef __aarch64__
"ld-linux-aarch64.so.1",
"libboost_system-mt.so.1.55.0",
"libboost_program_options-mt.so.1.55.0",
#endif /* __aarch64__ */
"libpthread.so.0",
"libdl.so.2",
Expand Down

0 comments on commit 58fe5f2

Please sign in to comment.