Skip to content

Commit 79fb388

Browse files
NStetskovych-zzlguohan
authored andcommittedMar 7, 2019
[bfn] Ged rid of ld_preload. Link against libsai only (sonic-net#429)
Signed-off-by: Nadiya.Stetskovych <nstetskovych@barefootnetworks.com>
1 parent 2e47b78 commit 79fb388

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed
 

‎saidiscovery/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ if SAIVS
1212
SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
1313
else
1414
if sonic_asic_platform_barefoot
15-
SAILIB=-L/opt/bfn/install/lib -lswitchsai -lswitchapi -lbf_switchd_lib -ltofinopdfixed_thrift -ldriver -lbfutils -lbfsys -lbfutils -L/opt/bfn/install/lib/tofinopd/switch -lpd -lpdcli -lpdthrift
15+
AM_CPPFLAGS += -I/opt/bfn/install/include
16+
SAILIB=-L/opt/bfn/install/lib -lswitchsai
1617
else
1718
SAILIB=-lsai
1819
endif

‎saisdkdump/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ if SAIVS
1313
SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
1414
else
1515
if sonic_asic_platform_barefoot
16-
AM_LDFLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs
1716
SAILIB=-L/opt/bfn/install/lib -lswitchsai
1817
else
1918
SAILIB=-lsai

‎syncd/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
1313
else
1414
if sonic_asic_platform_barefoot
1515
AM_CPPFLAGS += -I/opt/bfn/install/include
16-
AM_LDFLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs
1716
SAILIB=-L/opt/bfn/install/lib -lswitchsai
1817
else
1918
SAILIB=-lsai

‎syncd/scripts/syncd_init_common.sh

-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ config_syncd_barefoot()
136136
export ONIE_PLATFORM=`grep onie_platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'`
137137
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch
138138
./opt/bfn/install/bin/dma_setup.sh
139-
export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so:libbfutils.so:libbf_switchd_lib.so:libtofinopdfixed_thrift.so:libpdthrift.so
140139
}
141140

142141
config_syncd_nephos()

0 commit comments

Comments
 (0)
Please sign in to comment.