Skip to content

Commit

Permalink
do need it, but only for arm
Browse files Browse the repository at this point in the history
  • Loading branch information
geohot committed Nov 20, 2019
1 parent 2856c37 commit 9414615
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions SConscript
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Import('env', 'zmq')
Import('env', 'arch', 'zmq')

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

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

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

0 comments on commit 9414615

Please sign in to comment.