diff options
| author | Erik Verbruggen <erik.verbruggen@me.com> | 2013-02-01 12:57:22 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-02-06 08:48:12 +0100 |
| commit | ce5af0c8039db0395725e13d855795900d65596d (patch) | |
| tree | cc3e3a74eb039c947b1df653d760e648fc277ad8 /tools | |
| parent | 10f24399a7c626f6c497bd47d5aff6e212dcc0cb (diff) | |
Fixed the llvm bits of the build process.
Change-Id: I618e0ee413e9548817f84473917ccb8051f689f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/v4/main.cpp | 33 | ||||
| -rw-r--r-- | tools/v4/v4.pro | 3 |
2 files changed, 19 insertions, 17 deletions
diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp index 7ac064fb..0d215b9e 100644 --- a/tools/v4/main.cpp +++ b/tools/v4/main.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#ifndef QMLJS_NO_LLVM +#ifdef QMLJS_WITH_LLVM # include "private/qv4_llvm_p.h" -#endif +#endif // QMLJS_WITH_LLVM #include "private/debugging.h" #include "private/qv4object.h" @@ -153,7 +153,7 @@ static void showException(QQmlJS::VM::ExecutionContext *ctx) } } -#ifndef QMLJS_NO_LLVM +#ifdef QMLJS_WITH_LLVM int executeLLVMCode(void *codePtr) { using namespace QQmlJS; @@ -260,8 +260,7 @@ int evaluateCompiledCode(const QStringList &files) return EXIT_SUCCESS; } - -#endif +#endif // QMLJS_WITH_LLVM int main(int argc, char *argv[]) @@ -278,9 +277,9 @@ int main(int argc, char *argv[]) use_llvm_jit } mode = use_masm; -#ifndef QMLJS_NO_LLVM +#ifdef QMLJS_WITH_LLVM QQmlJS::LLVMOutputType fileType = QQmlJS::LLVMOutputObject; -#endif // QMLJS_NO_LLVM +#endif // QMLJS_WITH_LLVM bool enableDebugging = false; if (!args.isEmpty()) { @@ -301,7 +300,7 @@ int main(int argc, char *argv[]) args.removeFirst(); } -#ifndef QMLJS_NO_LLVM +#ifdef QMLJS_WITH_LLVM if (args.first() == QLatin1String("--compile")) { mode = use_llvm_compiler; args.removeFirst(); @@ -328,7 +327,7 @@ int main(int argc, char *argv[]) mode = use_llvm_jit; args.removeFirst(); } -#endif // QMLJS_NO_LLVM +#endif // QMLJS_WITH_LLVM if (args.first() == QLatin1String("--help")) { std::cerr << "Usage: v4 [|--debug|-d] [|--jit|--interpret|--compile|--aot|--llvm-jit] file..." << std::endl; return EXIT_SUCCESS; @@ -336,20 +335,20 @@ int main(int argc, char *argv[]) } switch (mode) { -#ifdef QMLJS_NO_LLVM - case use_llvm_compiler: - case use_llvm_runtime: - case use_llvm_jit: - std::cerr << "LLVM backend was not built, compiler is unavailable." << std::endl; - return EXIT_FAILURE; -#else // QMLJS_NO_LLVM +#ifdef QMLJS_WITH_LLVM case use_llvm_jit: return compileFiles(args, QQmlJS::LLVMOutputJit); case use_llvm_compiler: return compileFiles(args, fileType); case use_llvm_runtime: return evaluateCompiledCode(args); -#endif // QMLJS_NO_LLVM +#else // !QMLJS_WITH_LLVM + case use_llvm_compiler: + case use_llvm_runtime: + case use_llvm_jit: + std::cerr << "LLVM backend was not built, compiler is unavailable." << std::endl; + return EXIT_FAILURE; +#endif // QMLJS_WITH_LLVM case use_masm: case use_moth: { QScopedPointer<QQmlJS::EvalISelFactory> iSelFactory; diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro index 3f878fa6..fcf1b285 100644 --- a/tools/v4/v4.pro +++ b/tools/v4/v4.pro @@ -4,4 +4,7 @@ SOURCES = main.cpp include(../../src/v4/v4.pri) +llvm-libs { + DEFINES += QMLJS_WITH_LLVM +} load(qt_tool) |