Skip to content

Commit 7291189

Browse files
committed
[fix] decoupling librocksdb.a
1 parent 9ee0c02 commit 7291189

2 files changed

Lines changed: 2 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
with:
3131
path: deps/rocksdb
3232
key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_SHA }}
33-
- name: prevent deps distclean
34-
run: |
35-
touch deps/.make-cflags
36-
touch deps/.make-ldflags
3733
- name: install dependencies
3834
run: |
3935
sudo apt-get update
@@ -99,10 +95,6 @@ jobs:
9995
with:
10096
path: deps/rocksdb
10197
key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_SHA }}
102-
- name: prevent deps distclean
103-
run: |
104-
touch deps/.make-cflags
105-
touch deps/.make-ldflags
10698
- name: install dependencies
10799
run: |
108100
sudo apt-get update
@@ -135,10 +127,6 @@ jobs:
135127
with:
136128
path: deps/rocksdb
137129
key: ${{ runner.os }}-rocksdb-${{ env.ROCKSDB_SHA }}
138-
- name: prevent deps distclean
139-
run: |
140-
touch deps/.make-cflags
141-
touch deps/.make-ldflags
142130
- name: install dependencies
143131
run: |
144132
sudo apt-get update

src/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,8 @@ persist-settings:
457457
echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings; \
458458
echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings; \
459459
echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings; \
460+
echo "-Wno-unused-but-set-variable -Wno-error" > ../deps/.make-cflags; \
461+
echo "" > ../deps/.make-ldflags; \
460462
cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS); \
461463
touch $@; \
462464
else \

0 commit comments

Comments
 (0)