diff options
author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-07-31 07:22:19 +0000 |
---|---|---|
committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-07-31 07:22:19 +0000 |
commit | f0edbe5ca05431917073bb0dbdb88c2626fbfb67 (patch) | |
tree | fbe51109d4cbfed5a56c402cdec3d045b249f5a9 | |
parent | 7e0d6b3cdbee523871eb75db7ff738b8b08ad3f9 (diff) | |
download | fpc-f0edbe5ca05431917073bb0dbdb88c2626fbfb67.tar.gz |
Change the test for GNU make version 4 so that gmake lines are also discarded (needed for systems using GNU make as gmake executable)
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@39537 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | tests/utils/gparmake.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/utils/gparmake.pp b/tests/utils/gparmake.pp index b4ce34e3e0..be7dedae34 100644 --- a/tests/utils/gparmake.pp +++ b/tests/utils/gparmake.pp @@ -133,8 +133,9 @@ Function ProcessArgs: longint; readln(responsefile,s); { Avoid problem with GNU make version 4 which adds lines containing - make[X] Entering/leaving ... } - if not (copy(s,1,5)='make[') then + make[X] Entering/leaving ... + Modified to also accept gmake } + if pos('make[',s)=0 then AddFile(s); end; close(responsefile); |