gnucash-on-windows master: Fix building bdw-gc on gcc-10.1.
John Ralls
jralls at code.gnucash.org
Sat May 23 17:20:09 EDT 2020
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/e49fa471 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/bf76f124 (commit)
commit e49fa4719fd1c386c745ccd15f693207aa124ba8
Author: John Ralls <jralls at ceridwen.us>
Date: Sat May 23 14:14:40 2020 -0700
Fix building bdw-gc on gcc-10.1.
See https://gcc.cnu.org/gcc-10/porting_to.html, "Default to
-fno-common." for an explanation.
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 4a514e3..cc3ae74 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -86,5 +86,11 @@ module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'gu
module_extra_env["gnucash-unstable"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+_bdw_gc_cflags = '-fcommon'
+if 'CFLAGS' in os.environ:
+ _bdw_gc_cflags = os.environ['CFLAGS'] + ' -fcommon'
+
+module_extra_env['bdw-gc']={'CFLAGS':_bdw_gc_cflags}
+
if _branch in ('master', 'unstable'):
module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
Summary of changes:
jhbuildrc.in | 6 ++++++
1 file changed, 6 insertions(+)
More information about the gnucash-changes
mailing list