build: More OBS build failure fixes
It seems the order in which static code and -lfoo is passed to the linker matters. Change-Id: I3b25be0154053ae8eb5f0a24c39fb9a229130fcf
This commit is contained in:
parent
478f82f47e
commit
2a8183bdf0
|
@ -84,9 +84,9 @@ if DEVICE_UHD
|
|||
bin_PROGRAMS += osmo-trx-uhd
|
||||
osmo_trx_uhd_SOURCES = osmo-trx.cpp
|
||||
osmo_trx_uhd_LDADD = \
|
||||
$(builddir)/device/uhd/libdevice.la \
|
||||
$(COMMON_LDADD) \
|
||||
$(UHD_LIBS) \
|
||||
$(builddir)/device/uhd/libdevice.la
|
||||
$(UHD_LIBS)
|
||||
osmo_trx_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS)
|
||||
endif
|
||||
|
||||
|
@ -94,8 +94,8 @@ if DEVICE_USRP1
|
|||
bin_PROGRAMS += osmo-trx-usrp1
|
||||
osmo_trx_usrp1_SOURCES = osmo-trx.cpp
|
||||
osmo_trx_usrp1_LDADD = \
|
||||
$(builddir)/device/usrp1/libdevice.la \
|
||||
$(COMMON_LDADD) \
|
||||
$(USRP_LIBS) \
|
||||
$(builddir)/device/usrp1/libdevice.la
|
||||
$(USRP_LIBS)
|
||||
osmo_trx_usrp1_CPPFLAGS = $(AM_CPPFLAGS) $(USRP_CFLAGS)
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue