-
Notifications
You must be signed in to change notification settings - Fork 617
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use Ninja to generate them, so that the provided compiler is used, to determine SIZEOF_VOID_P.
- Loading branch information
Showing
1 changed file
with
2 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -103,18 +103,12 @@ jobs: | |
- name: Prepare licenses | ||
run: bash -x ../../scripts/prepare_binary_package.sh ../.. | ||
working-directory: api/cpp/ | ||
- uses: ilammy/msvc-dev-cmd@v1 | ||
- name: Select MSVC (windows) | ||
run: | | ||
echo "CC=cl.exe" >> $GITHUB_ENV | ||
echo "CXX=cl.exe" >> $GITHUB_ENV | ||
if: matrix.host == 'windows-2022' | ||
- name: C++ Build | ||
uses: lukka/[email protected] | ||
with: | ||
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced | ||
cmakeListsTxtPath: CMakeLists.txt | ||
cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DRust_CARGO_TARGET=${{ matrix.target }} -DCMAKE_C_COMPILER=arm-none-eabi-gcc -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY ${{ env.SLINT_MCU_FEATURES }}" | ||
cmakeAppendedArgs: "-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DRust_CARGO_TARGET=${{ matrix.target }} -DCMAKE_C_COMPILER=arm-none-eabi-gcc -DCMAKE_AR=arm-none-eabi-ar -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY ${{ env.SLINT_MCU_FEATURES }}" | ||
buildDirectory: ${{ runner.workspace }}/cppbuild | ||
buildWithCMakeArgs: "--config Release" | ||
- name: cpack | ||
|
@@ -164,12 +158,6 @@ jobs: | |
- name: Prepare licenses | ||
run: bash -x ../../scripts/prepare_binary_package.sh ../.. | ||
working-directory: api/cpp/ | ||
- uses: ilammy/msvc-dev-cmd@v1 | ||
- name: Select MSVC (windows) | ||
run: | | ||
echo "CC=cl.exe" >> $GITHUB_ENV | ||
echo "CXX=cl.exe" >> $GITHUB_ENV | ||
if: matrix.host == 'windows-2022' | ||
- name: C++ Build | ||
uses: lukka/[email protected] | ||
with: | ||
|
@@ -178,7 +166,7 @@ jobs: | |
# NOTE: xtensa-esp-elf-gcc as compiler for the RISC-V targets is wrong, but the compiler argument here is only | ||
# used to ensure that SIZEOF_VOID_P is 4 in the generated cmake config file. Otherwise this build requires no | ||
# C compiler. | ||
cmakeAppendedArgs: "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DESP_PLATFORM=1 -DIDF_TARGET=${{ matrix.idf_target }} -DRust_CARGO_TARGET=${{ matrix.rust_target }} -DCMAKE_C_COMPILER=xtensa-esp-elf-gcc -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DSLINT_LIBRARY_CARGO_FLAGS='-Zbuild-std=core,alloc' ${{ env.SLINT_MCU_FEATURES }}" | ||
cmakeAppendedArgs: "-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DESP_PLATFORM=1 -DIDF_TARGET=${{ matrix.idf_target }} -DRust_CARGO_TARGET=${{ matrix.rust_target }} -DCMAKE_C_COMPILER=xtensa-esp-elf-gcc -DCMAKE_AR=arm-none-eabi-ar -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DSLINT_LIBRARY_CARGO_FLAGS='-Zbuild-std=core,alloc' ${{ env.SLINT_MCU_FEATURES }}" | ||
buildDirectory: ${{ runner.workspace }}/cppbuild | ||
buildWithCMakeArgs: "--config Release" | ||
- name: cpack | ||
|