Unverified Commit ede6ffb4 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gktpo/bug_34219'

parents e1accd27 40809c54

projects/tor/build

+4 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,10 @@ mkdir -p /var/tmp/build 
  TORCONFIGDIR="$distdir/assets/common"

  TORCONFIGDIR="$distdir/assets/common"

  libsdir=$distdir/jniLibs/[% c("var/abi") %]

  libsdir=$distdir/jniLibs/[% c("var/abi") %]

  mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor"

  mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor"

  # We need to make sure our ZSTD dependencey is properly picked up.

  # --enable-zstd is not enough.

  export ZSTD_CFLAGS=-I/var/tmp/dist/zstd/include

  export ZSTD_LIBS=/var/tmp/dist/zstd/lib/libzstd.a

[% END %]

[% END %]





[% IF c("var/linux") || c("var/windows") %]

[% IF c("var/linux") || c("var/windows") %]