aboutsummaryrefslogtreecommitdiff
path: root/backend/ninja
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2020-06-21 13:16:57 +0200
committerdec05eba <dec05eba@protonmail.com>2020-07-06 07:39:58 +0200
commit79cc3a081283285dbbcb7dde196c53b11c7c5c27 (patch)
treef74788016157651abd1a8f652a24bee20c9a9926 /backend/ninja
parent1c1b372decaa2fb7f9761c376f8b44d2e6e33c35 (diff)
Fix gitmodule url, working on fixing zig...
Diffstat (limited to 'backend/ninja')
-rw-r--r--backend/ninja/Ninja.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp
index 7bdcbaa..bacbd4c 100644
--- a/backend/ninja/Ninja.cpp
+++ b/backend/ninja/Ninja.cpp
@@ -1144,14 +1144,14 @@ namespace backend
ninja::NinjaVariable zigHeaderFile("headerFile");
vector<ninja::NinjaArg> zigTestArgs = {
- ninja::NinjaArg::createRaw("zig test $in --output $out --output-h $headerFile")
+ ninja::NinjaArg::createRaw("zig test $in --name $out -femit-h $headerFile")
};
vector<ninja::NinjaArg> compileZigArgs = {
ninja::NinjaArg::createRaw("zig build-obj"),
ninja::NinjaArg::createRaw("$in"),
- ninja::NinjaArg::createRaw("--output-h $headerFile"),
- ninja::NinjaArg::createRaw("--output $out")
+ ninja::NinjaArg::createRaw("-femit-h"),
+ ninja::NinjaArg::createRaw("--name $out")
};
// TODO: Find a way to do this more efficiently
@@ -1342,8 +1342,8 @@ namespace backend
{
buildExeArgs.insert(buildExeArgs.end(), {
ninja::NinjaArg::createRaw("zig build-exe"),
- ninja::NinjaArg::createRaw("--name __tmp_zig"),
- ninja::NinjaArg::createRaw("--output $out"),
+ //ninja::NinjaArg::createRaw("--name __tmp_zig"),
+ ninja::NinjaArg::createRaw("--name $out"),
ninja::NinjaArg::createRaw("$object_args"),
});
buildExeArgs.insert(buildExeArgs.end(), commonZigArgs.begin(), commonZigArgs.end());
@@ -1493,8 +1493,8 @@ namespace backend
{
buildStaticArgs.insert(buildStaticArgs.end(), {
ninja::NinjaArg::createRaw("zig build-lib --static"),
- ninja::NinjaArg::createRaw("--name __tmp_zig"),
- ninja::NinjaArg::createRaw("--output $out"),
+ //ninja::NinjaArg::createRaw("--name __tmp_zig"),
+ ninja::NinjaArg::createRaw("--name $out"),
ninja::NinjaArg::createRaw("$object_args")
});
buildStaticArgs.insert(buildStaticArgs.end(), commonZigArgs.begin(), commonZigArgs.end());
@@ -1578,8 +1578,8 @@ namespace backend
{
buildDynamicArgs.insert(buildDynamicArgs.end(), {
ninja::NinjaArg::createRaw("zig build-lib --rdynamic"),
- ninja::NinjaArg::createRaw("--name __tmp_zig"),
- ninja::NinjaArg::createRaw("--output $out"),
+ //ninja::NinjaArg::createRaw("--name __tmp_zig"),
+ ninja::NinjaArg::createRaw("--name $out"),
ninja::NinjaArg::createRaw("$object_args")
});
buildDynamicArgs.insert(buildDynamicArgs.end(), commonZigArgs.begin(), commonZigArgs.end());