File tree 1 file changed +3
-5
lines changed
1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -644,9 +644,7 @@ build_single_target() {
644
644
export _CMAKE_GLOBAL=' -DCMAKE_BUILD_TYPE=Release'
645
645
export _CMAKE_CXX_GLOBAL=' '
646
646
647
- if [ " ${_OS} " = ' win' ]; then
648
- _CMAKE_GLOBAL=" -DCMAKE_SYSTEM_NAME=Windows ${_CMAKE_GLOBAL} "
649
- elif [ " ${_OS} " = ' linux' ]; then
647
+ if [ " ${_OS} " = ' linux' ]; then
650
648
# Override defaults such as: 'lib/aarch64-linux-gnu'
651
649
_CMAKE_GLOBAL=" ${_CMAKE_GLOBAL} -DCMAKE_INSTALL_LIBDIR=lib"
652
650
@@ -665,12 +663,12 @@ build_single_target() {
665
663
unset CC
666
664
667
665
if [ " ${_OS} " = ' win' ]; then
666
+ _CMAKE_GLOBAL=" -DCMAKE_SYSTEM_NAME=Windows ${_CMAKE_GLOBAL} "
667
+
668
668
[ " ${_CPU} " = ' x86' ] && _RCFLAGS_GLOBAL=" ${_RCFLAGS_GLOBAL} --target=pe-i386"
669
669
[ " ${_CPU} " = ' x64' ] && _RCFLAGS_GLOBAL=" ${_RCFLAGS_GLOBAL} --target=pe-x86-64"
670
670
[ " ${_CPU} " = ' a64' ] && _RCFLAGS_GLOBAL=" ${_RCFLAGS_GLOBAL} --target=${_TRIPLET} " # llvm-windres supports triplets here. https://github.com/llvm/llvm-project/blob/main/llvm/tools/llvm-rc/llvm-rc.cpp
671
- fi
672
671
673
- if [ " ${_OS} " = ' win' ]; then
674
672
if [ " ${_HOSTOS} " = ' win' ]; then
675
673
# '-G MSYS Makefiles' command-line option is problematic due to spaces
676
674
# and unwanted escaping/splitting. Pass it via envvar instead.
You can’t perform that action at this time.
0 commit comments