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

Commit 1659ecc

Browse files
committed
libcuda-crypt.so is now a real shared object; don't ship libcuda-crypt.a anymore
1 parent e6af1a7 commit 1659ecc

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ DESTDIR ?= dist
1818
install:
1919
mkdir -p $(DESTDIR)
2020
ifneq ($(OS),Darwin)
21-
cp -f src/$(V)/libcuda-crypt.a $(DESTDIR)
2221
cp -f src/$(V)/libcuda-crypt.so $(DESTDIR)
2322
endif
2423
ls -lh $(DESTDIR)

ci/build.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ cd "$(dirname "$0")/.."
55
source ci/env.sh
66
source ci/upload-ci-artifact.sh
77

8-
for CUDA_HOME in /usr/local/cuda-10.0 /usr/local/cuda-10.1; do
9-
CUDA_HOME_BASE=$(basename $CUDA_HOME)
8+
CUDA_HOMES=(
9+
/usr/local/cuda-10.0
10+
/usr/local/cuda-10.1
11+
)
12+
13+
for CUDA_HOME in "${CUDA_HOMES[@]}"; do
14+
CUDA_HOME_BASE="$(basename "$CUDA_HOME")"
1015
echo "--- Build: $CUDA_HOME_BASE"
1116
(
1217
if [[ ! -d $CUDA_HOME/lib64 ]]; then
13-
echo Invalid CUDA_HOME: $CUDA_HOME
18+
echo "Invalid CUDA_HOME: $CUDA_HOME"
1419
exit 1
1520
fi
1621

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

26-
cp -vf $CUDA_HOME/version.txt "$DESTDIR"/cuda-version.txt
31+
cp -vf "$CUDA_HOME"/version.txt "$DESTDIR"/cuda-version.txt
2732
)
2833
done
2934

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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
5757
$(NVCC) -Xcompiler "-fPIC" --lib --output-file $@ $^
5858

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

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

0 commit comments

Comments
 (0)