Skip to content

Commit

Permalink
don't set SQLITE3_LIB_DIR in FreeBSD images
Browse files Browse the repository at this point in the history
the environment variable has broken procedural macro crates which
depends on `libsqlite3-sys`, such as `migrations_macros`.

even without the variable, `libsqlite3-sys` finds the correct path
anyway.

fixes #520.
  • Loading branch information
tesaguri committed Apr 8, 2021
1 parent e4a4eba commit b7308ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions docker/Dockerfile.i686-unknown-freebsd
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ RUN /freebsd-extras.sh i686
ENV CARGO_TARGET_I686_UNKNOWN_FREEBSD_LINKER=i686-unknown-freebsd12-gcc \
CC_i686_unknown_freebsd=i686-unknown-freebsd12-gcc \
CXX_i686_unknown_freebsd=i686-unknown-freebsd12-g++ \
I686_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/i686-unknown-freebsd12/ \
SQLITE3_LIB_DIR=/usr/local/x86_64-unknown-freebsd12/lib/
I686_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/i686-unknown-freebsd12/
3 changes: 1 addition & 2 deletions docker/Dockerfile.x86_64-unknown-freebsd
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ RUN /freebsd-extras.sh x86_64
ENV CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd12-gcc \
CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-gcc \
CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-g++ \
X86_64_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/x86_64-unknown-freebsd12/ \
SQLITE3_LIB_DIR=/usr/local/x86_64-unknown-freebsd12/lib/
X86_64_UNKNOWN_FREEBSD_OPENSSL_DIR=/usr/local/x86_64-unknown-freebsd12/

0 comments on commit b7308ac

Please sign in to comment.