Skip to content

Commit

Permalink
fix: compatibility with Ubuntu 22 LTS
Browse files Browse the repository at this point in the history
fix: .
  • Loading branch information
lukasrothenberger committed Nov 4, 2024
1 parent 2d3e54b commit fa31283
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ jobs:
sudo ln -s /usr/bin/opt-11 /usr/bin/opt || true
sudo apt-get install -y python3-tk
sudo apt-get install -y libboost-all-dev
sudo apt-get install python3-pipx
sudo pipx ensurepath
- name: "Setup DiscoPoP Profiler - Build"
run: |
Expand All @@ -111,7 +113,7 @@ jobs:
- name: C++ unit tests
run: |
build/test/unit_tests/DiscoPoP_UT
execute_end_to_end_tests:
runs-on: ubuntu-20.04
name: Execute end-to-end tests
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ endif()
# install DiscoPoP python modules
message(STATUS "Installing DiscoPoP python modules")
execute_process(
COMMAND ${Python3_EXECUTABLE} -m pip install ${DiscoPoP_SOURCE_DIR}
COMMAND ${Python3_EXECUTABLE} -m pipx install ${DiscoPoP_SOURCE_DIR}
RESULT_VARIABLE DP_INSTALLATION_EXIT_CODE
OUTPUT_VARIABLE DP_INSTALLATION_OUTPUT
)
Expand Down
8 changes: 4 additions & 4 deletions rtlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
set(DiscoPoP_SOURCES
runtimeFunctions.cpp
runtimeFunctionsGlobals.cpp

memory/MemoryManager.cpp
memory/Signature.cpp

Expand All @@ -24,7 +24,7 @@ set(DiscoPoP_SOURCES
calltree/DependencyMetadata.cpp
calltree/MetaDataQueueElement.cpp
calltree/utils.cpp

injected_functions/dp_add_bb_deps.cpp
injected_functions/dp_alloca.cpp
injected_functions/dp_call.cpp
Expand All @@ -47,7 +47,7 @@ set(DiscoPoP_SOURCES
)

set(CMAKE_CXX_FLAGS
"-O2 -std=c++17 -pthread -fno-rtti -fPIE -fPIC -ffreestanding")
"-O2 -std=c++17 -pthread -fno-rtti -fPIE -fPIC")

# add_custom_target(DiscoPoP)

Expand Down Expand Up @@ -119,4 +119,4 @@ install(TARGETS DiscoPoP_RT ARCHIVE DESTINATION lib)
# compile simple-alias-detection
#exec_program(${CMAKE_CURRENT_SOURCE_DIR}/simple-alias-detection/compile.sh
# ARGS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
#)
#)

0 comments on commit fa31283

Please sign in to comment.