[Mesa-dev] [PATCH 04/10] swr: [rasterizer jitter] Clean up EngineBuilder construction

[Tim Rowley]

---
 src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index 79118f5..bdb8a52 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -106,16 +106,10 @@ JitManager::JitManager(uint32_t simdWidth, const char *arch, const char* core)
     std::unique_ptr<Module> newModule(new Module(fnName.str(), mContext));
     mpCurrentModule = newModule.get();
 
-    auto &&EB = EngineBuilder(std::move(newModule));
-    EB.setTargetOptions(tOpts);
-    EB.setOptLevel(CodeGenOpt::Aggressive);
-
     StringRef hostCPUName;
 
     hostCPUName = sys::getHostCPUName();
 
-    EB.setMCPU(hostCPUName);
-
 #if defined(_WIN32)
     // Needed for MCJIT on windows
     Triple hostTriple(sys::getProcessTriple());
@@ -123,7 +117,11 @@ JitManager::JitManager(uint32_t simdWidth, const char *arch, const char* core)
     mpCurrentModule->setTargetTriple(hostTriple.getTriple());
 #endif // _WIN32
 
-    mpExec = EB.create();
+    mpExec = EngineBuilder(std::move(newModule))
+        .setTargetOptions(tOpts)
+        .setOptLevel(CodeGenOpt::Aggressive)
+        .setMCPU(hostCPUName)
+        .create();
 
 #if LLVM_USE_INTEL_JITEVENTS
     JITEventListener *vTune = JITEventListener::createIntelJITEventListener();
-- 
2.7.4