From fc6104a242ba6551cd644004b54ae201375da0c2 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Wed, 4 Aug 2021 12:02:02 +0100
Subject: [PATCH] add -shared to the PCH flags to prevent error when using the
MESA SDK
---
meson.build | 6 +++---
src/binary_c.h | 9 ---------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/meson.build b/meson.build
index c8d619956..3f20baf8d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
###########################################################
# meson build file for binary_c
#
-# (c) Robert Izzard 12/11/2020
+# (c) Robert Izzard 04/08/2021
#
# Known to work with binary_c 2.2.pre1 using gcc and clang.
#
@@ -198,7 +198,6 @@ foreach buggy_perl_version : buggy_perls
endif
endforeach
-
############################################################
# compiler object
#
@@ -1375,11 +1374,12 @@ if get_option('usepch') == true
_opt,
_pic,
_incdirs,
+ '-shared', # required to prevent MESA SDK errors
'-MT', 'binary_c.h.gch',
'-MMD',
'-MP',
'-MF', _depfile_path,
- '-x', 'c-header'
+ '-x', 'c-header',
]
pch_sourcefiles = [ _gch ]
cflags += [
diff --git a/src/binary_c.h b/src/binary_c.h
index 174339036..9ea3855e4 100644
--- a/src/binary_c.h
+++ b/src/binary_c.h
@@ -92,12 +92,3 @@
#endif //BINARY_C_H
-
-/*
-#define __dummy_function_concat(A,B) A##B
-#define __dummy_function2(A) \
- static void MAYBE_UNUSED __dummy_function_concat(__dummy_name,A)(void); \
- static void MAYBE_UNUSED __dummy_function_concat(__dummy_name,A)(void){return;}
-#define __dummy_function __dummy_function2(__COUNTER__)
-__dummy_function
-*/
--
GitLab