Skip to content

Link stdc++ #1139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 11, 2020
Merged

Link stdc++ #1139

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3915a94
Fix geninterop.py include paths
filmor May 10, 2020
57815f6
Ensure that monoclr is linked as a C++ library
filmor May 10, 2020
7b15512
Force preload libmono and fix bug in LD_LIBRARY_PATH forwarding
filmor May 10, 2020
a3c29cd
Update pynetinit.c
filmor May 11, 2020
6ad6705
Merge branch 'master' into link-stdc++
filmor May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix geninterop.py include paths
  • Loading branch information
@filmor
filmor committed May 10, 2020
commit 3915a942384f297195cfd3d581339ba6b4b66fd2
4 changes: 3 additions & 1 deletion tools/geninterop/geninterop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ def preprocess_python_headers():
include_py = sysconfig.get_config_var("INCLUDEPY")
include_dirs.append(include_py)

include_args = [c for p in include_dirs for c in ["-I", p]]

defines = [
"-D", "__attribute__(x)=",
"-D", "__inline__=inline",
Expand All @@ -198,7 +200,7 @@ def preprocess_python_headers():
defines.extend(("-D", "PYTHON_WITH_WIDE_UNICODE"))

python_h = os.path.join(include_py, "Python.h")
cmd = ["clang", "-pthread", "-I"] + include_dirs + defines + ["-E", python_h]
cmd = ["clang", "-pthread"] + include_args + defines + ["-E", python_h]

# normalize as the parser doesn't like windows line endings.
lines = []
Expand Down