diff --git a/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml b/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml index be6598edf8..3c011ee445 100644 --- a/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml +++ b/local/recipes/kde/kf6-syntaxhighlighting/recipe.toml @@ -67,13 +67,20 @@ rm -rf "${HOST_INDEXER_DIR}" mkdir -p "${HOST_INDEXER_DIR}" cd "${HOST_INDEXER_DIR}" +# cookbook_redbear_redoxer wraps the script with the cross toolchain. +# Clear LDFLAGS/RUSTFLAGS and point cmake at the host gcc/g++ so the +# indexer build doesn't pick up redox sysroot paths or compiler defines. +unset LDFLAGS LDFLAGS_x86_64_unknown_redox CFLAGS CXXFLAGS CFLAGS_x86_64_unknown_redox CXXFLAGS_x86_64_unknown_redox RUSTFLAGS cmake "${COOKBOOK_SOURCE}" \ + -DCMAKE_C_COMPILER=/usr/bin/gcc \ + -DCMAKE_CXX_COMPILER=/usr/bin/g++ \ -DCMAKE_INSTALL_PREFIX="${HOST_INDEXER_DIR}/install" \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF \ -DECM_DIR="${ECM_DIR}" \ + -DCMAKE_PREFIX_PATH=/usr \ -Wno-dev make -j"${COOKBOOK_MAKE_JOBS}" katehighlightingindexer || make -C src/indexer -j"${COOKBOOK_MAKE_JOBS}" @@ -96,7 +103,7 @@ cmake "${COOKBOOK_SOURCE}" \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF \ -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF \ - -DKATEHIGHLIGHTINGINDEXER_EXECUTABLE="${HOST_INDEXER_DIR}/src/indexer/katehighlightingindexer" \ + -DKATEHIGHLIGHTINGINDEXER_EXECUTABLE="${HOST_INDEXER_DIR}/bin/katehighlightingindexer" \ -Wno-dev cmake --build . -j${COOKBOOK_MAKE_JOBS}