Browse Source

Tweak linux include dirs, previous change broke GCC7 include dirs on archlinux.

pull/1022/head
Rokas Kupstys 9 years ago
parent
commit
86f2c59ec5
  1. 7
      src/Parser/ParserOptions.cs

7
src/Parser/ParserOptions.cs

@ -252,17 +252,17 @@ namespace CppSharp.Parser
string compiler, longVersion, shortVersion; string compiler, longVersion, shortVersion;
GetUnixCompilerInfo(out compiler, out longVersion, out shortVersion); GetUnixCompilerInfo(out compiler, out longVersion, out shortVersion);
string[] versions = {longVersion, shortVersion}; string[] versions = {longVersion, shortVersion};
AddSystemIncludeDirs($"{headersPath}/usr/include"); string[] tripples = {"x86_64-linux-gnu", "x86_64-pc-linux-gnu"};
if (compiler == "gcc") if (compiler == "gcc")
{ {
foreach (var version in versions) foreach (var version in versions)
{ {
AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}"); AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}");
AddSystemIncludeDirs($"{headersPath}/usr/include/x86_64-linux-gnu/c++/{version}");
AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/backward"); AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/backward");
foreach (var tripple in tripples)
AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/{tripple}");
} }
} }
string[] tripples = {"x86_64-linux-gnu", "x86_64-pc-linux-gnu"};
foreach (var tripple in tripples) foreach (var tripple in tripples)
{ {
foreach (var version in versions) foreach (var version in versions)
@ -273,6 +273,7 @@ namespace CppSharp.Parser
} }
AddSystemIncludeDirs($"{headersPath}/usr/include/{tripple}"); AddSystemIncludeDirs($"{headersPath}/usr/include/{tripple}");
} }
AddSystemIncludeDirs($"{headersPath}/usr/include");
} }
public void Setup() public void Setup()

Loading…
Cancel
Save