mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-04-20 08:39:37 +08:00
Fix merge conflict error
This commit is contained in:
parent
5b20d9f326
commit
49bd503308
@ -314,34 +314,6 @@ build:linux:cross:ppc64le:clang-12:default:
|
||||
EIGEN_CI_CXX_COMPILER: clang++-12
|
||||
EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu clang-12
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
######## loongarch64 #################################################
|
||||
|
||||
.build:linux:cross:loongarch64:
|
||||
extends: .build:linux:cross
|
||||
variables:
|
||||
EIGEN_CI_TARGET_ARCH: loongarch64
|
||||
EIGEN_CI_CROSS_TARGET_TRIPLE: loongarch64-linux-gnu
|
||||
tags:
|
||||
- eigen-runner
|
||||
- linux
|
||||
- x86-64
|
||||
|
||||
# GCC-14 (minimum on Ubuntu 24)
|
||||
build:linux:cross:loongarch64:gcc-14:default:
|
||||
extends: .build:linux:cross:loongarch64
|
||||
image: ubuntu:24.04
|
||||
variables:
|
||||
EIGEN_CI_CROSS_INSTALL: g++-14-loongarch64-linux-gnu
|
||||
EIGEN_CI_CROSS_C_COMPILER: loongarch64-linux-gnu-gcc-14
|
||||
EIGEN_CI_CROSS_CXX_COMPILER: loongarch64-linux-gnu-g++-14
|
||||
EIGEN_CI_ADDITIONAL_ARGS: >-
|
||||
-DCMAKE_SYSTEM_NAME=Linux
|
||||
-DCMAKE_CROSSCOMPILING_EMULATOR=qemu-loongarch64-static;-L;/usr/loongarch64-linux-gnu
|
||||
-DEIGEN_TEST_LSX=on
|
||||
|
||||
>>>>>>> 9589cc4e7 (Fix loongarch64 emulated tests.)
|
||||
######## MR Smoke Tests ########################################################
|
||||
|
||||
build:linux:cross:x86-64:gcc-10:default:smoketest:
|
||||
|
Loading…
x
Reference in New Issue
Block a user