Browse Source
[linux] fix aarch64 builds (again) + fix with slightly outdated qt (#2612 )
Fixes issues building on aarch64 linux with a slightly outdated system qt; also fixes linker selection process
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2612
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
pull/2602/head
lizzie
3 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
6 additions and
4 deletions
CMakeLists.txt
src/dynarmic/tests/CMakeLists.txt
src/yuzu/configuration/shared_widget.h
@ -895,13 +895,13 @@ if (MSVC AND CXX_CLANG)
endif ( )
endif ( )
if ( YUZU_USE_FASTER_LD )
if ( YUZU_USE_FASTER_LD )
# f a l l b a c k i f e v e r y t h i n g fails ( bfd )
set ( LINKER bfd )
# c l a n g s h o u l d a l w a y s u s e l l d
# c l a n g s h o u l d a l w a y s u s e l l d
find_program ( LLD lld )
find_program ( LLD lld )
if ( LLD )
if ( LLD )
set ( LINKER lld )
set ( LINKER lld )
endif ( )
endif ( )
# G N U a p p e a r s t o w o r k b e t t e r w i t h m o l d
# G N U a p p e a r s t o w o r k b e t t e r w i t h m o l d
# T O D O : m o l d h a s b e e n s l o w l a t e l y , s e e i f b e t t e r o p t i o n s exist ( search for gold? )
# T O D O : m o l d h a s b e e n s l o w l a t e l y , s e e i f b e t t e r o p t i o n s exist ( search for gold? )
if ( CXX_GCC )
if ( CXX_GCC )
@ -910,7 +910,6 @@ if (YUZU_USE_FASTER_LD)
set ( LINKER mold )
set ( LINKER mold )
endif ( )
endif ( )
endif ( )
endif ( )
message ( NOTICE "Selecting ${LINKER} as linker" )
message ( NOTICE "Selecting ${LINKER} as linker" )
add_link_options ( "-fuse-ld=${LINKER}" )
add_link_options ( "-fuse-ld=${LINKER}" )
endif ( )
endif ( )
@ -135,6 +135,8 @@ target_include_directories(dynarmic_tests PRIVATE . ../src)
target_compile_options ( dynarmic_tests PRIVATE ${ DYNARMIC_CXX_FLAGS } )
target_compile_options ( dynarmic_tests PRIVATE ${ DYNARMIC_CXX_FLAGS } )
target_compile_definitions ( dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=1 )
target_compile_definitions ( dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=1 )
target_compile_options ( dynarmic_tests PRIVATE -mavx2 )
if ( "x86_64" IN_LIST ARCHITECTURE )
target_compile_options ( dynarmic_tests PRIVATE -mavx2 )
endif ( )
add_test ( dynarmic_tests dynarmic_tests --durations yes )
add_test ( dynarmic_tests dynarmic_tests --durations yes )
@ -13,6 +13,7 @@
# include <QString>
# include <QString>
# include <QStringLiteral>
# include <QStringLiteral>
# include <QWidget>
# include <QWidget>
# include <QObject>
# include <qobjectdefs.h>
# include <qobjectdefs.h>
# include "qt_common/shared_translation.h"
# include "qt_common/shared_translation.h"