File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -270,10 +270,8 @@ cmake_build() {
270270 ;;
271271 esac
272272
273- cmake_args+=(-DCMAKE_C_COMPILER=" $( get_compiler_name ${CC} ) " )
274- cmake_args+=(-DCMAKE_CXX_COMPILER=" $( get_compiler_name ${CXX} ) " )
275- cmake_args+=(-DCMAKE_C_COMPILER_ARG1=" $( get_compiler_arg1 ${CC} ) " )
276- cmake_args+=(-DCMAKE_CXX_COMPILER_ARG1=" $( get_compiler_arg1 ${CXX} ) " )
273+ cmake_args+=(-DCMAKE_C_COMPILER=" ${CC} " )
274+ cmake_args+=(-DCMAKE_CXX_COMPILER=" ${CXX} " )
277275 cmake_args+=(-DCMAKE_C_FLAGS=" ${CFLAGS} " )
278276 cmake_args+=(-DCMAKE_CXX_FLAGS=" ${CXXFLAGS} " )
279277 cmake_args+=(-DCMAKE_EXE_LINKER_FLAGS=" ${LDFLAGS} " )
@@ -1609,9 +1607,11 @@ common_setup_windows() {
16091607common_setup_msvc () {
16101608 LIBS_SHARED=' ON'
16111609 LIBS_STATIC=' OFF'
1610+ CC=" ${HOST} -gcc"
1611+ CXX=" ${HOST} -g++"
16121612 # Libtool bug prevents -static-libgcc from being set in LDFLAGS
1613- CC= " ${HOST} -gcc -static-libgcc"
1614- CXX= " ${HOST} -g++ -static-libgcc"
1613+ CFLAGS+= ' -static-libgcc'
1614+ CXXFLAGS+= ' -static-libgcc'
16151615 common_setup_windows
16161616}
16171617
You can’t perform that action at this time.
0 commit comments