commit 7322869
hovercats
·
2025-02-09 08:14:23 +0000 UTC
parent 0a05027
muon: add patch to build with cproc
2 files changed,
+101,
-1
1@@ -0,0 +1,100 @@
2+From ad624c180bb847337453d4e857812c15253eebaf Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Sun, 9 Feb 2025 09:10:06 +0100
5+Subject: [PATCH] fix build with cproc
6+
7+Author: Micheal Forney
8+
9+---
10+ src/backend/common_args.c | 2 --
11+ src/backend/introspect.c | 1 -
12+ src/backend/xcode.c | 1 -
13+ src/lang/analyze.c | 1 -
14+ src/lang/object.c | 1 -
15+ src/main.c | 2 +-
16+ 6 files changed, 1 insertion(+), 7 deletions(-)
17+
18+diff --git a/src/backend/common_args.c b/src/backend/common_args.c
19+index d840bcf0..54b3acea 100644
20+--- a/src/backend/common_args.c
21++++ b/src/backend/common_args.c
22+@@ -404,7 +404,6 @@ ca_prepare_target_args(struct workspace *wk, const struct project *proj, struct
23+ }
24+
25+ obj _lang, _n;
26+- (void)_n;
27+ obj_dict_for(wk, tgt->required_compilers, _lang, _n) {
28+ enum compiler_language lang = _lang;
29+ obj comp_id;
30+@@ -856,7 +855,6 @@ ca_regenerate_build_command(struct workspace *wk, bool opts_only)
31+ }
32+
33+ obj key, val;
34+- (void)key;
35+ obj_dict_for(wk, wk->global_opts, key, val) {
36+ struct obj_option *o = get_obj_option(wk, val);
37+ if (o->source != option_value_source_environment) {
38+diff --git a/src/backend/introspect.c b/src/backend/introspect.c
39+index 96cf9217..cc45691f 100644
40+--- a/src/backend/introspect.c
41++++ b/src/backend/introspect.c
42+@@ -275,7 +275,6 @@ introspect_options(struct workspace *wk)
43+ make_obj(wk, &doc, obj_array);
44+
45+ obj key, opt;
46+- (void)key;
47+ obj_dict_for(wk, wk->global_opts, key, opt) {
48+ obj_array_push(wk, doc, introspect_option(wk, opt));
49+ }
50+diff --git a/src/backend/xcode.c b/src/backend/xcode.c
51+index 7db1e1c6..d1f178f9 100644
52+--- a/src/backend/xcode.c
53++++ b/src/backend/xcode.c
54+@@ -525,7 +525,6 @@ xc_build_configuration_list(struct xc_ctx *ctx, struct project *proj, struct obj
55+ obj pbx_gcc_preprocessor_definitions = xc_pbx_new(ctx, obj_array);
56+
57+ obj _lang, args;
58+- (void)_lang;
59+ // TODO: This adds duplicates
60+ obj_dict_for(ctx->wk, tgt->args, _lang, args) {
61+ obj_array_for(ctx->wk, args, v) {
62+diff --git a/src/lang/analyze.c b/src/lang/analyze.c
63+index 4d08c390..5d1ab720 100644
64+--- a/src/lang/analyze.c
65++++ b/src/lang/analyze.c
66+@@ -540,7 +540,6 @@ pop_scope_group(struct workspace *wk)
67+
68+ { // Now, merge `merged` into base
69+ obj k, aid;
70+- (void)k;
71+ obj_dict_for(wk, merged, k, aid) {
72+ struct assignment *a = bucket_arr_get(&assignments, aid), *b;
73+ if ((b = assign_lookup(wk, a->name))) {
74+diff --git a/src/lang/object.c b/src/lang/object.c
75+index 3a66d0fe..b759a386 100644
76+--- a/src/lang/object.c
77++++ b/src/lang/object.c
78+@@ -720,7 +720,6 @@ static obj *
79+ obj_array_index_pointer_raw(struct workspace *wk, obj arr, int64_t i)
80+ {
81+ obj v;
82+- (void)v;
83+ int64_t j = 0;
84+ obj_array_for_(wk, arr, v, iter)
85+ {
86+diff --git a/src/main.c b/src/main.c
87+index 47e047ca..ec47960a 100644
88+--- a/src/main.c
89++++ b/src/main.c
90+@@ -622,7 +622,7 @@ static bool
91+ cmd_dump_toolchains(void *_ctx, uint32_t argc, uint32_t argi, char *const argv[])
92+ {
93+ struct obj_compiler comp = { 0 };
94+- bool set_linker, set_static_linker;
95++ bool set_linker = false, set_static_linker = false;
96+
97+ const char *n1_args[32] = { "<value1>", "<value2>" };
98+ struct args n1 = { n1_args, 2 };
99+--
100+2.45.2
101+
+1,
-1
1@@ -1 +1 @@
2-0.3.0-315-g1016db60 r0
3+0.3.0-315-g1016db60 r1