Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
libcuda-crypt.so is now a real shared object; don't ship libcuda-cryp…
Browse files Browse the repository at this point in the history
…t.a anymore
  • Loading branch information
mvines committed Jun 21, 2019
1 parent e6af1a7 commit 1659ecc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ DESTDIR ?= dist
install:
mkdir -p $(DESTDIR)
ifneq ($(OS),Darwin)
cp -f src/$(V)/libcuda-crypt.a $(DESTDIR)
cp -f src/$(V)/libcuda-crypt.so $(DESTDIR)
endif
ls -lh $(DESTDIR)
Expand Down
13 changes: 9 additions & 4 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ cd "$(dirname "$0")/.."
source ci/env.sh
source ci/upload-ci-artifact.sh

for CUDA_HOME in /usr/local/cuda-10.0 /usr/local/cuda-10.1; do
CUDA_HOME_BASE=$(basename $CUDA_HOME)
CUDA_HOMES=(
/usr/local/cuda-10.0
/usr/local/cuda-10.1
)

for CUDA_HOME in "${CUDA_HOMES[@]}"; do
CUDA_HOME_BASE="$(basename "$CUDA_HOME")"
echo "--- Build: $CUDA_HOME_BASE"
(
if [[ ! -d $CUDA_HOME/lib64 ]]; then
echo Invalid CUDA_HOME: $CUDA_HOME
echo "Invalid CUDA_HOME: $CUDA_HOME"
exit 1
fi

Expand All @@ -23,7 +28,7 @@ for CUDA_HOME in /usr/local/cuda-10.0 /usr/local/cuda-10.1; do
make install
make clean

cp -vf $CUDA_HOME/version.txt "$DESTDIR"/cuda-version.txt
cp -vf "$CUDA_HOME"/version.txt "$DESTDIR"/cuda-version.txt
)
done

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $V/lib$(LIB).a: $V/crypt-dlink.o $V/chacha_cbc.o $V/aes_cbc.o $V/verify.o $V/poh
$(NVCC) -Xcompiler "-fPIC" --lib --output-file $@ $^

$V/lib$(LIB).so: $V/crypt-dlink.o $V/chacha_cbc.o $V/aes_cbc.o $V/verify.o $V/poh_verify.o
$(NVCC) -Xcompiler "-fPIC" --lib --shared --output-file $@ $^
$(NVCC) -Xcompiler "-fPIC" --shared --output-file $@ $^

$V/$(CHACHA_TEST_BIN): $(CHACHA_DIR)/test.cu $V/lib$(LIB).a
$(NVCC) $(CFLAGS) -L$V -l$(LIB) $< -o $@
Expand Down

0 comments on commit 1659ecc

Please sign in to comment.