From 0248e4955dfb0daf2a17b79a6ab8fab2eb7bce52 Mon Sep 17 00:00:00 2001 From: spaceface777 Date: Mon, 30 Nov 2020 20:56:17 +0100 Subject: [PATCH] gen: fix `undef`ing __has_include on macos tcc (#7057) --- tinycc | 1 + vlib/v/gen/cgen.v | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 160000 tinycc diff --git a/tinycc b/tinycc new file mode 160000 index 0000000000..38dea90b2f --- /dev/null +++ b/tinycc @@ -0,0 +1 @@ +Subproject commit 38dea90b2f7cdd1d1960060663bc54258606adf5 diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v index d82394ec46..612509dca0 100644 --- a/vlib/v/gen/cgen.v +++ b/vlib/v/gen/cgen.v @@ -306,12 +306,13 @@ pub fn (mut g Gen) init() { g.cheaders.writeln(g.pref.custom_prelude) } else if !g.pref.no_preludes { g.cheaders.writeln('// Generated by the V compiler') - g.cheaders.writeln(' + tcc_undef_has_include := ' #if defined(__TINYC__) && defined(__has_include) // tcc does not support has_include properly yet, turn it off completely #undef __has_include -#endif -') +#endif' + g.cheaders.writeln(tcc_undef_has_include) + g.includes.writeln(tcc_undef_has_include) g.cheaders.writeln(get_guarded_include_text('', 'The C compiler can not find . Please install build-essentials')) // int64_t etc g.cheaders.writeln(c_builtin_types) if g.pref.is_bare {