[PATCH 3/6] gitlab: add arm-softmmu tests to the macOS build
Alex Bennée <[email protected]>
| Newsgroups | org.nongnu.qemu-arm,org.nongnu.qemu-devel |
|---|---|
| Message-ID | <[email protected]> |
Now we have fixed the compiler issues lets have at it. Reviewed-by: Pierrick Bouvier <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- .gitlab-ci.d/macos.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/macos.yml b/.gitlab-ci.d/macos.yml index bdb3eae18f0..40b9b637b3b 100644 --- a/.gitlab-ci.d/macos.yml +++ b/.gitlab-ci.d/macos.yml @@ -22,7 +22,7 @@ - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - brew update - brew install $PKGS - - brew install aarch64-elf-gcc i686-elf-gcc x86_64-elf-gcc + - brew install arm-none-eabi-gcc aarch64-elf-gcc i686-elf-gcc x86_64-elf-gcc - if test -n "$PYPI_PKGS" ; then PYLIB=$($PYTHON -c 'import sysconfig; print(sysconfig.get_path("stdlib"))'); rm -f $PYLIB/EXTERNALLY-MANAGED; $PIP3 install --break-system-packages $PYPI_PKGS ; fi script: - mkdir build @@ -40,8 +40,9 @@ aarch64-macos-15-build: PATH_EXTRA: /opt/homebrew/gettext/bin PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig CONFIGURE_ARGS: - --target-list=aarch64-softmmu,i386-softmmu,x86_64-softmmu + --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,x86_64-softmmu --cross-prefix-aarch64=aarch64-elf- + --cross-prefix-arm=arm-none-eabi- --cross-prefix-i386=i686-elf- --cross-prefix-x86_64=x86_64-elf- --disable-plugins -- 2.47.3