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 @@ -197,7 +197,7 @@ jobs:
197197      shell : bash 
198198      run : | 
199199        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \ 
200-         -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows 
200+         -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 }}  
201201name : MSBuild 
202202      run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142 
203203    - name : bundle artifact tar 
Original file line number Diff line number Diff line change @@ -212,7 +212,14 @@ endif()
212212
213213#default behaviour 
214214include_directories (${CMAKE_SOURCE_DIR} )
215- add_compile_definitions (GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR} " )
215+ 
216+ # When cross-compiling, define HOST_CPU as the canonical name of the CPU on 
217+ # which the built Git will run (for instance "x86_64"). 
218+ if (NOT  HOST_CPU)
219+ 	add_compile_definitions (GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR} " )
220+ else ()
221+ 	add_compile_definitions (GIT_HOST_CPU="${HOST_CPU} " )
222+ endif ()
216223add_compile_definitions (SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
217224add_compile_definitions (NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
218225			SHA1DC_INIT_SAFE_HASH_DEFAULT=0
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments