Skip to content

Commit 86f2c59

Browse files
committed
Tweak linux include dirs, previous change broke GCC7 include dirs on archlinux.
1 parent 7a3adcd commit 86f2c59

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/Parser/ParserOptions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,17 +252,17 @@ public void SetupLinux(string headersPath="")
252252
string compiler, longVersion, shortVersion;
253253
GetUnixCompilerInfo(out compiler, out longVersion, out shortVersion);
254254
string[] versions = {longVersion, shortVersion};
255-
AddSystemIncludeDirs($"{headersPath}/usr/include");
255+
string[] tripples = {"x86_64-linux-gnu", "x86_64-pc-linux-gnu"};
256256
if (compiler == "gcc")
257257
{
258258
foreach (var version in versions)
259259
{
260260
AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}");
261-
AddSystemIncludeDirs($"{headersPath}/usr/include/x86_64-linux-gnu/c++/{version}");
262261
AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/backward");
262+
foreach (var tripple in tripples)
263+
AddSystemIncludeDirs($"{headersPath}/usr/include/c++/{version}/{tripple}");
263264
}
264265
}
265-
string[] tripples = {"x86_64-linux-gnu", "x86_64-pc-linux-gnu"};
266266
foreach (var tripple in tripples)
267267
{
268268
foreach (var version in versions)
@@ -273,6 +273,7 @@ public void SetupLinux(string headersPath="")
273273
}
274274
AddSystemIncludeDirs($"{headersPath}/usr/include/{tripple}");
275275
}
276+
AddSystemIncludeDirs($"{headersPath}/usr/include");
276277
}
277278

278279
public void Setup()

0 commit comments

Comments
 (0)