@@ -184,10 +184,10 @@ READLINE_DEPS = @READLINE_DEPS@
184
184
READLINE_CFLAGS = @READLINE_CFLAGS@
185
185
186
186
# Where is expat? This will be empty if expat was not available.
187
- LIBEXPAT = @LIBEXPAT@
187
+ LIBEXPAT = -Wl,-Bstatic @LIBEXPAT@ -Wl,-Bdynamic
188
188
189
189
# Where is lzma? This will be empty if lzma was not available.
190
- LIBLZMA = @LIBLZMA@
190
+ LIBLZMA = -Wl,-Bstatic @LIBLZMA@ -Wl,-Bdynamic
191
191
192
192
# Where is libbabeltrace? This will be empty if lbabeltrace was not
193
193
# available.
@@ -589,6 +589,10 @@ INTERNAL_LDFLAGS = \
589
589
$(CXXFLAGS ) $(GLOBAL_CFLAGS ) $(MH_LDFLAGS ) \
590
590
$(LDFLAGS ) $(CONFIG_LDFLAGS )
591
591
592
+ CONF_LIBS = @LIBS@
593
+ comma = ,
594
+ LIBS = $(patsubst -lncursesw,-Wl$(comma ) -Bstatic -lncursesw -ltinfo -Wl$(comma ) -Bdynamic,$(CONF_LIBS ) )
595
+
592
596
# If your system is missing alloca(), or, more likely, it's there but
593
597
# it doesn't work, then refer to libiberty.
594
598
@@ -597,7 +601,7 @@ INTERNAL_LDFLAGS = \
597
601
# LIBIBERTY appears twice on purpose.
598
602
CLIBS = $(SIM ) $(READLINE ) $(OPCODES ) $(BFD ) $(ZLIB ) $(INTL ) $(LIBIBERTY ) $(LIBDECNUMBER ) \
599
603
$(XM_CLIBS ) $(NAT_CLIBS ) $(GDBTKLIBS ) \
600
- @ LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
604
+ $( LIBS ) @GUILE_LIBS@ @PYTHON_LIBS@ \
601
605
$(LIBEXPAT ) $(LIBLZMA ) $(LIBBABELTRACE ) $(LIBIPT ) \
602
606
$(LIBIBERTY ) $(WIN32LIBS ) $(LIBGNU ) $(LIBICONV ) $(LIBMPFR )
603
607
CDEPS = $(XM_CDEPS ) $(NAT_CDEPS ) $(SIM ) $(BFD ) $(READLINE_DEPS ) \
0 commit comments