Mercurial > vanilla

annotate dev/gobject-introspection/patch-cc.patch @ 1279:46e278d09c6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core/llvm: disable linking to atmic
author David Demelier <markand@malikania.fr>
date Mon, 15 Nov 2021 09:08:29 +0100
parents f7b260b91a3d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
754
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 diff --git a/giscanner/dumper.py b/giscanner/dumper.py
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 index 2b851a53c76cb906bb9db50a6f47aef7d9cf767e..888cffcd1651f8a91dcb64c051c1f2143aa93d49 100644
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 --- a/giscanner/dumper.py
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 +++ b/giscanner/dumper.py
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 @@ -25,6 +25,7 @@ import shlex
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 import subprocess
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 import tempfile
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
8
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 +from distutils import sysconfig
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 from .gdumpparser import IntrospectionBinary
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 from . import pkgconfig, utils
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 from .ccompiler import CCompiler
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 @@ -94,7 +95,8 @@ class DumpCompiler(object):
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 if self._compiler.check_is_msvc():
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 self._linker_cmd = ['link.exe']
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 else:
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 - self._linker_cmd = shlex.split(os.environ.get('CC', 'cc'))
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 + cc = sysconfig.get_config_var('CC')
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 + self._linker_cmd = shlex.split(os.environ.get('CC', cc))
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
20
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 # Public API
f7b260b91a3d dev/gobject-introspection: search CC in distutils
David Demelier <markand@malikania.fr>
parents:
diff changeset
22