@@ -7,7 +7,7 @@ RUN apt-get update && \
77 if [ "$TARGETARCH" = "$BUILDARCH" ]; then \
88 rustup target list --installed > TARGET && \
99 echo gcc > LINKER && \
10- apt-get install -y gcc libgcc-s1 cmake unixodbc-dev libltdl-dev pkg-config && \
10+ apt-get install -y gcc libgcc-s1 cmake pkg-config && \
1111 LIBMULTIARCH=$(gcc -print-multiarch); \
1212 LIBDIR="/lib/$LIBMULTIARCH" ; \
1313 USRLIBDIR="/usr/lib/$LIBMULTIARCH" ; \
@@ -16,15 +16,15 @@ RUN apt-get update && \
1616 echo aarch64-unknown-linux-gnu > TARGET && \
1717 echo aarch64-linux-gnu-gcc > LINKER && \
1818 dpkg --add-architecture arm64 && apt-get update && \
19- apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross unixodbc-dev:arm64 libltdl-dev:arm64 pkg-config && \
19+ apt-get install -y gcc-aarch64-linux-gnu libgcc-s1-arm64-cross pkg-config && \
2020 LIBDIR="/lib/aarch64-linux-gnu" ; \
2121 USRLIBDIR="/usr/lib/aarch64-linux-gnu" ; \
2222 HOST_TRIPLE="aarch64-linux-gnu" ; \
2323 elif [ "$TARGETARCH" = "arm" ]; then \
2424 echo armv7-unknown-linux-gnueabihf > TARGET && \
2525 echo arm-linux-gnueabihf-gcc > LINKER && \
2626 dpkg --add-architecture armhf && apt-get update && \
27- apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang unixodbc-dev:armhf libltdl-dev:armhf pkg-config && \
27+ apt-get install -y gcc-arm-linux-gnueabihf libgcc-s1-armhf-cross cmake libclang1 clang pkg-config && \
2828 cargo install --force --locked bindgen-cli && \
2929 SYSROOT=$(arm-linux-gnueabihf-gcc -print-sysroot); \
3030 echo "--sysroot=$SYSROOT -I$SYSROOT/usr/include -I$SYSROOT/usr/include/arm-linux-gnueabihf" > BINDGEN_EXTRA_CLANG_ARGS; \
@@ -35,27 +35,26 @@ RUN apt-get update && \
3535 echo "Unsupported cross compilation target: $TARGETARCH" ; \
3636 exit 1; \
3737 fi && \
38- echo $USRLIBDIR > ODBC_LIBDIR && \
3938 cp $LIBDIR/libgcc_s.so.1 /opt/sqlpage-libs/ && \
4039 rustup target add $(cat TARGET) && \
4140 cargo init .
4241
4342# Build dependencies (creates a layer that avoids recompiling dependencies on every build)
4443COPY Cargo.toml Cargo.lock ./
4544RUN BINDGEN_EXTRA_CLANG_ARGS=$(cat BINDGEN_EXTRA_CLANG_ARGS || true) \
46- RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
4745 cargo build \
4846 --target $(cat TARGET) \
4947 --config target.$(cat TARGET).linker='"' $(cat LINKER)'"' \
48+ --features odbc-static \
5049 --profile superoptimized
5150
5251# Build the project
5352COPY . .
5453RUN touch src/main.rs && \
55- RS_ODBC_LINK_SEARCH=$(cat ODBC_LIBDIR) \
5654 cargo build \
5755 --target $(cat TARGET) \
5856 --config target.$(cat TARGET).linker='"' $(cat LINKER)'"' \
57+ --features odbc-static \
5958 --profile superoptimized && \
6059 mv target/$(cat TARGET)/superoptimized/sqlpage sqlpage.bin
6160
0 commit comments