ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 22:47:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gnu_build.mk: pass static libraries in '-l:' format

Browse Source 
Fixes #4743
This commit is contained in:
Christian Prochaska 2023-01-27 11:05:28 +01:00 committed by Christian Helmuth
parent 0724db2d80
commit 9dbaa150d6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
repos/ports/mk/gnu_build.mk
View File

@ -128,10 +128,19 @@ CXXFLAGS += $(COMMON_CFLAGS_CXXFLAGS)
# Unfortunately, the use of '--start-group' and '--end-group' does not suffice # Unfortunately, the use of '--start-group' and '--end-group' does not suffice
# in all cases because 'libtool' strips those arguments from the 'LIBS' variable. # in all cases because 'libtool' strips those arguments from the 'LIBS' variable.
# #
LDLIBS_A = $(filter %.a, $(sort $(STATIC_LIBS)) $(EXT_OBJECTS) $(LIBGCC)) # 'STATIC_LIBS', 'EXT_OBJECTS' and 'LIBGCC' contain absolute paths.
# We convert these to '-l:*.a' so libtool does not add these existing static
# libraries (found in 'LIBS') to any new static libraries it creates.
#
LDLIBS_A_ABSOLUTE = $(filter %.a, $(sort $(STATIC_LIBS)) $(EXT_OBJECTS) $(LIBGCC))
LDLIBS_A = $(addprefix -l:,$(notdir $(LDLIBS_A_ABSOLUTE)))
LDLIBS_SO = $(addprefix -l:,$(sort $(SHARED_LIBS))) LDLIBS_SO = $(addprefix -l:,$(sort $(SHARED_LIBS)))
LDLIBS += -L$(PWD) $(LDLIBS_A) $(LDLIBS_SO) $(LDLIBS_A) LDLIBS += -L$(PWD) $(LDLIBS_A) $(LDLIBS_SO) $(LDLIBS_A)
static_libs_symlinks.tag:
$(VERBOSE)for lib in $(LDLIBS_A_ABSOLUTE); do ln -s $$lib; done
$(VERBOSE)touch $@
# #
# By default, assume that there exists a 'configure' script in the top-level # By default, assume that there exists a 'configure' script in the top-level
# of the package. # of the package.
@ -146,7 +155,7 @@ Makefile reconfigure: $(MAKEFILE_LIST)
# #
# Invoke configure script with the Genode environment # Invoke configure script with the Genode environment
# #
Makefile reconfigure: env.sh $(SHARED_LIBS) Makefile reconfigure: env.sh static_libs_symlinks.tag $(SHARED_LIBS)
@$(MSG_CONFIG)$(TARGET) @$(MSG_CONFIG)$(TARGET)
$(VERBOSE)source env.sh && $(CONFIGURE_SCRIPT) $(MKENV) $(CONFIGURE_ARGS) $(CONFIGURE_OUTPUT_FILTER) $(VERBOSE)source env.sh && $(CONFIGURE_SCRIPT) $(MKENV) $(CONFIGURE_ARGS) $(CONFIGURE_OUTPUT_FILTER)