diff options
-rw-r--r-- | TODO.md | 1 | ||||
-rwxr-xr-x | build.sh | 2 | ||||
-rw-r--r-- | tests/test.sh | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -2,3 +2,4 @@ * Gui * Full unprivileged instructions support * Windows support +* Allow running tests with existing mips compiler instead of building its own @@ -5,6 +5,6 @@ mkdir -p build ROOT="$(dirname "$(readlink -f "$0")")" cd build -/usr/lib/qt5/bin/qmake "$ROOT" +qtchooser -run-tool=qmake -qt=5 "$ROOT" make sub-qtmips_cli sub-qtmips_gui diff --git a/tests/test.sh b/tests/test.sh index d04d380..1302bf4 100644 --- a/tests/test.sh +++ b/tests/test.sh @@ -68,7 +68,7 @@ qtmips_make() { mkdir -p "$BUILD_DIR" local ORIG="$(pwd)" cd "$BUILD_DIR" - /usr/lib64/qt5/bin/qmake "$PROJECT_ROOT" || echo_fail "QtMips qmake failed!" + qtchooser -run-tool=qmake -qt=5 "$PROJECT_ROOT" || echo_fail "QtMips qmake failed!" make "$@" || echo_fail "QtMips build failed! (target: $@)" cd "$ORIG" } |