Skip to content

Commit 156abae

Browse files
committed
Adjust the libaustin install process
1 parent 383e076 commit 156abae

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,11 @@ target_link_libraries(
265265
target_link_libraries(dd_profiling-embedded PUBLIC dl pthread rt)
266266

267267
# add libaustin
268-
add_library(austin SHARED IMPORTED)
268+
find_library(austin_location NAMES libaustin.a)
269+
message(STATUS "libaustin location at:" ${austin_location})
270+
add_library(austin STATIC IMPORTED)
269271
set_target_properties(
270-
austin PROPERTIES IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/lib_debug/libaustin.a"
272+
austin PROPERTIES IMPORTED_LOCATION ${austin_location}
271273
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/include/libaustin")
272274

273275
set(LIBDD_PROFILING_EMBEDDED_OBJECT "${CMAKE_BINARY_DIR}/libdd_profiling-embedded.o")

app/base-env/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@ RUN apt-get update \
186186
# possibly useful command
187187
# CFLAGS="-g -O0 -DTRACE" ./configure
188188
# Valid commit : git checkout a7a292b3f5a1058051b017c0d339a678efdec704
189-
RUN git clone --branch r1viollet/libaustin_v2 https://github.com/r1viollet/austin.git && \
189+
RUN git clone --branch libaustin https://github.com/P403n1x87/austin.git && \
190190
cd austin && \
191191
autoreconf --install && \
192-
CFLAGS="-g -O0 -DTRACE" ./configure && \
192+
CFLAGS="-O2" ./configure && \
193193
make && \
194194
make install
195195

tools/launch_local_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ if [ $PERFORM_CLEAN -eq 1 ]; then
126126
echo "Clean image : ${DOCKER_NAME}"
127127
# if docker image does not exist, we should not fail
128128
docker image rm "${DOCKER_NAME}" || true
129-
CACHE_OPTION="--no-cache"
129+
#CACHE_OPTION="--no-cache"
130130
fi
131131

132132
# Check if base image exists

0 commit comments

Comments
 (0)