From 7cb4672344f04c0e65a016a8dad86c6f248ac906 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 12 May 2018 22:55:52 +0300 Subject: [PATCH] Travis: remove LLVM for now --- .travis.yml | 6 +++--- rpcs3/Emu/Cell/SPURecompiler.cpp | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 768d63eca3..6796d453e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ install: fi; before_script: - - git submodule update --init llvm asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers + - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers - mkdir build ; cd build - export CMAKE_PREFIX_PATH=~/Qt/${QTVER}/gcc_64/lib/cmake - if [ "$TRAVIS_PULL_REQUEST" = false ]; then @@ -55,10 +55,10 @@ before_script: else export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST"; fi; - - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja; + - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_NATIVE_INSTRUCTIONS=OFF -DWITHOUT_LLVM=ON -G Ninja; script: - - ninja + - ninja -j 2 after_script: - cd build diff --git a/rpcs3/Emu/Cell/SPURecompiler.cpp b/rpcs3/Emu/Cell/SPURecompiler.cpp index f557d1be58..0e95fc8c8f 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.cpp +++ b/rpcs3/Emu/Cell/SPURecompiler.cpp @@ -820,6 +820,8 @@ std::vector spu_recompiler_base::block(const be_t* ls, u32 lsa) return result; } +#ifdef LLVM_AVAILABLE + #include "Emu/CPU/CPUTranslator.h" #include "llvm/ADT/Triple.h" #include "llvm/IR/LegacyPassManager.h" @@ -3118,3 +3120,12 @@ std::unique_ptr spu_recompiler_base::make_llvm_recompiler() } DECLARE(spu_llvm_recompiler::g_decoder); + +#else + +std::unique_ptr spu_recompiler_base::make_llvm_recompiler() +{ + fmt::throw_exception("LLVM is not available in this build."); +} + +#endif