diff options
| author | dec05eba <dec05eba@protonmail.com> | 2018-09-21 10:39:56 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2020-07-06 07:39:33 +0200 |
| commit | 2a076c85676612d32e5076ae8708618b13bc6ff7 (patch) | |
| tree | e0a15a7c8bee67b6e23616d1bf96f2ac019c604f /backend/ninja | |
| parent | bf42a3fe559b53b62db9c6363efbec612804dbe7 (diff) | |
Fix zig test including pthread, fix broken sibs test for c/c++
Diffstat (limited to 'backend/ninja')
| -rw-r--r-- | backend/ninja/Ninja.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index c642a4c..fc1142b 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -551,7 +551,7 @@ namespace backend if(strncmp(&cLibraries[libraryIndexStart], "-l", 2) == 0) libraryIndexStart += 2; - else if(strcmp(&cLibraries[libraryIndexStart], "-pthread") == 0) + else if(strncmp(&cLibraries[libraryIndexStart], "-pthread", libraryIndexEnd - libraryIndexStart) == 0) continue; size_t libraryPathLength = libraryIndexEnd - libraryIndexStart; @@ -571,13 +571,15 @@ namespace backend if(strncmp(&cLibraries[libraryIndexStart], "-l", 2) == 0) libraryIndexStart += 2; - else if(strcmp(&cLibraries[libraryIndexStart], "-pthread") == 0) + else if(strncmp(&cLibraries[libraryIndexStart], "-pthread", libraryIndexEnd - libraryIndexStart) == 0) continue; size_t libraryPathLength = libraryIndexEnd - libraryIndexStart; if(libraryPathLength > 0) result.push_back(ninja::NinjaArg::createRaw(cLibraries.substr(libraryIndexStart, libraryPathLength))); } + else + ++i; } return result; |