snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions 1 Activity

build-style/cmake: also fix -isystem for Ninja 

Discovered by cross-build failure of gnuradio-osmosdr.

While we're at it, fix flags.make in batch.
This commit is contained in:
Đoàn Trần Công Danh 2021-02-20 12:16:56 +07:00
parent f610253281
commit 8e102f22ce
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/build-style/cmake.sh
View File

@ -67,8 +67,12 @@ _EOF
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \ CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc} cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
# Replace -isystem with -I for Qt4 and Qt5 packages # Replace -isystem with -I
find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \; if [ "$CMAKE_GENERATOR" = "Unix Makefiles" ]; then
find . -name flags.make -exec sed -i -e 's/-isystem/-I/g' +
elif [ "$CMAKE_GENERATOR" = Ninja ]; then
sed -i -e 's/-isystem/-I/g' build.ninja
fi
} }
do_build() { do_build() {