Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit 9414615

Browse files
committed
do need it, but only for arm
1 parent 2856c37 commit 9414615

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

SConscript

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Import('env', 'zmq')
1+
Import('env', 'arch', 'zmq')
22

33
# TODO: remove src-prefix and cereal from command string. can we set working directory?
44
env.Command(["gen/c/include/c++.capnp.h", "gen/c/include/java.capnp.h"], [], "mkdir -p cereal/gen/c/include && touch $TARGETS")
@@ -33,7 +33,10 @@ messaging_deps = [
3333
messaging_lib = env.Library('messaging', messaging_deps)
3434

3535
# note, this rebuilds the deps shared, zmq is statically linked to make APK happy
36-
messaging_shared_lib = env.SharedLibrary('messaging_shared', messaging_deps, LIBS=[zmq, 'm', 'stdc++'])
36+
shared_lib_shared_lib = [zmq, 'm', 'stdc++']
37+
if arch == "aarch64":
38+
shared_lib_shared_lib.append("gnustl_shared")
39+
messaging_shared_lib = env.SharedLibrary('messaging_shared', messaging_deps, LIBS=shared_lib_shared_lib)
3740
env.Command(['messaging/messaging.so'], [messaging_shared_lib], "chmod 777 $SOURCES && ln -sf `realpath $SOURCES` $TARGET")
3841

3942
env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=['messaging', 'zmq'])

0 commit comments

Comments
 (0)