File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -158,7 +158,7 @@ jobs:
158
158
shell : bash
159
159
run : |
160
160
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
161
- -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
161
+ -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows -DHOST_CPU=${{ matrix.arch }}
162
162
- name : MSBuild
163
163
run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
164
164
- name : bundle artifact tar
Original file line number Diff line number Diff line change @@ -194,7 +194,14 @@ endif()
194
194
195
195
#default behaviour
196
196
include_directories (${CMAKE_SOURCE_DIR} )
197
- add_compile_definitions (GIT_HOST_CPU= "${CMAKE_SYSTEM_PROCESSOR} " )
197
+
198
+ # When cross-compiling, define HOST_CPU as the canonical name of the CPU on
199
+ # which the built Git will run (for instance "x86_64").
200
+ if (NOT HOST_CPU )
201
+ add_compile_definitions (GIT_HOST_CPU= "${CMAKE_SYSTEM_PROCESSOR} " )
202
+ else ()
203
+ add_compile_definitions (GIT_HOST_CPU= "${HOST_CPU} " )
204
+ endif ()
198
205
add_compile_definitions (SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX )
199
206
add_compile_definitions (NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
200
207
SHA1DC_INIT_SAFE_HASH_DEFAULT=0
You can’t perform that action at this time.
0 commit comments