Skip to content

Commit 14565b4

Browse files
committed
_build.sh: minor cleanup for windows targets 2
1 parent d694d14 commit 14565b4

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

_build.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,7 @@ build_single_target() {
644644
export _CMAKE_GLOBAL='-DCMAKE_BUILD_TYPE=Release'
645645
export _CMAKE_CXX_GLOBAL=''
646646

647-
if [ "${_OS}" = 'win' ]; then
648-
_CMAKE_GLOBAL="-DCMAKE_SYSTEM_NAME=Windows ${_CMAKE_GLOBAL}"
649-
elif [ "${_OS}" = 'linux' ]; then
647+
if [ "${_OS}" = 'linux' ]; then
650648
# Override defaults such as: 'lib/aarch64-linux-gnu'
651649
_CMAKE_GLOBAL="${_CMAKE_GLOBAL} -DCMAKE_INSTALL_LIBDIR=lib"
652650

@@ -665,12 +663,12 @@ build_single_target() {
665663
unset CC
666664

667665
if [ "${_OS}" = 'win' ]; then
666+
_CMAKE_GLOBAL="-DCMAKE_SYSTEM_NAME=Windows ${_CMAKE_GLOBAL}"
667+
668668
[ "${_CPU}" = 'x86' ] && _RCFLAGS_GLOBAL="${_RCFLAGS_GLOBAL} --target=pe-i386"
669669
[ "${_CPU}" = 'x64' ] && _RCFLAGS_GLOBAL="${_RCFLAGS_GLOBAL} --target=pe-x86-64"
670670
[ "${_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
672671

673-
if [ "${_OS}" = 'win' ]; then
674672
if [ "${_HOSTOS}" = 'win' ]; then
675673
# '-G MSYS Makefiles' command-line option is problematic due to spaces
676674
# and unwanted escaping/splitting. Pass it via envvar instead.

0 commit comments

Comments
 (0)