Skip to content

Commit 5e20ef8

Browse files
kleisaukefarindk
authored andcommitted
mingw: set CMAKE_FIND_ROOT_PATH accordingly
1 parent 514465a commit 5e20ef8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

scripts/run-ci.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,16 @@ if [ "$MINGW" == "32" ]; then
7171
export CXX=i686-w64-mingw32-g++
7272
BIN_SUFFIX=.exe
7373
BIN_WRAPPER=/usr/lib/wine/wine
74-
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));/usr/i686-w64-mingw32/lib"
74+
MINGW_SYSROOT="/usr/i686-w64-mingw32"
75+
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));$MINGW_SYSROOT/lib"
7576
elif [ "$MINGW" == "64" ]; then
7677
# Make sure the correct compiler will be used.
7778
export CC=x86_64-w64-mingw32-gcc
7879
export CXX=x86_64-w64-mingw32-g++
7980
BIN_SUFFIX=.exe
8081
BIN_WRAPPER=/usr/lib/wine/wine64
81-
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));/usr/x86_64-w64-mingw32/lib"
82+
MINGW_SYSROOT="/usr/x86_64-w64-mingw32"
83+
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));$MINGW_SYSROOT/lib"
8284
fi
8385

8486
PKG_CONFIG_PATH=
@@ -138,7 +140,7 @@ if [ "$CURRENT_OS" = "osx" ] ; then
138140
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_FIND_FRAMEWORK=LAST"
139141
fi
140142
if [ -n "$MINGW" ]; then
141-
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_SYSTEM_NAME=Windows"
143+
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH=$MINGW_SYSROOT"
142144
fi
143145
if [ "$CLANG_TIDY" = "1" ]; then
144146
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"

0 commit comments

Comments
 (0)