Skip to content

Commit

Permalink
Merge pull request #214 from Wenzel/ci/fix_fdp_compilation
Browse files Browse the repository at this point in the history
ci: FDP on Linux links with rt
  • Loading branch information
Wenzel authored Sep 6, 2021
2 parents c57d9b7 + b63210f commit 7d483ad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ jobs:
- name: Compile and install FDP library
run: |
cd icebox/src/FDP
g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so
g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so -lrt
sudo cp include/* /usr/local/include
sudo cp libFDP.so /usr/local/lib
- name: install stable toolchain with clippy
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:

- name: install VirtualBox's FDP headers
run: |
g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so
g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so -lrt
sudo cp include/* /usr/local/include
sudo cp libFDP.so /usr/local/lib
working-directory: icebox/src/FDP
Expand Down
2 changes: 1 addition & 1 deletion python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN git clone https://github.com/bitdefender/libkvmi.git \
# libFDP.so
RUN git clone --depth 1 https://github.com/thalium/icebox \
&& cd icebox/src/FDP \
&& g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so \
&& g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so -lrt \
&& mv include/* /usr/local/include/ \
&& mv libFDP.so /usr/local/lib/ \
&& cd - \
Expand Down

0 comments on commit 7d483ad

Please sign in to comment.