diff options
| author | lns <matzeton@googlemail.com> | 2022-04-16 22:18:19 +0200 |
|---|---|---|
| committer | lns <matzeton@googlemail.com> | 2022-04-16 22:18:19 +0200 |
| commit | db83f82d29df4fd0dfe638fad305366fb265edb8 (patch) | |
| tree | 305735c7907f73848661f891644d3f4c3dbf058c | |
| parent | 645aeaf5b44ada9a4bcbc5e6d7ebf17ba4a82ea4 (diff) | |
Fixed build if BUILD_NDPI=ON. May happen during XCompilation.
Signed-off-by: lns <matzeton@googlemail.com>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | scripts/get-and-build-libndpi.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e4752e063..5814dfaed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,9 @@ if(BUILD_NDPI) SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libnDPI DOWNLOAD_COMMAND "" CONFIGURE_COMMAND env + CC=${CMAKE_C_COMPILER} + CXX=false + PKG_CONFIG=${PKG_CONFIG_EXECUTABLE} CFLAGS=${CMAKE_C_FLAGS} LDFLAGS=${CMAKE_MODULE_LINKER_FLAGS} CROSS_COMPILE_TRIPLET=${CROSS_COMPILE_TRIPLET} diff --git a/scripts/get-and-build-libndpi.sh b/scripts/get-and-build-libndpi.sh index 8b83ae988..39b775158 100755 --- a/scripts/get-and-build-libndpi.sh +++ b/scripts/get-and-build-libndpi.sh @@ -12,6 +12,9 @@ flock -x -n 42 || { cat <<EOF ------ environment variables ------ +CC=${CC:-} +CXX=${CXX:-} +PKG_CONFIG=${PKG_CONFIG:-} CFLAGS=${CFLAGS:-} LDFLAGS=${LDFLAGS:-} CROSS_COMPILE_TRIPLET=${CROSS_COMPILE_TRIPLET:-} |