diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2017-11-08 11:08:37 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2017-11-08 11:08:37 -0800 |
| commit | 53d8f220e16a19edcc9d71be062a8d77db5f03d7 (patch) | |
| tree | 2214fe8cfb5c70bdf53c91a1e08d4e427e9809d7 /Mkfiles | |
| parent | 9fd8a34938e942354fddab2ce14cbaa118264851 (diff) | |
| download | nasm-53d8f220e16a19edcc9d71be062a8d77db5f03d7.tar.gz | |
msvc.mak: fix yet another recursion situation
We don't want to call make to rebuild msvc.dep when that is what we
are actually trying to do, over and over again...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/msvc.mak | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index a29a869e..425faa95 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -382,11 +382,14 @@ dep: msvc.dep # Include and/or generate msvc.dep as needed. This is too complex to # use the include-command feature, but we can open-code it here. !IF $(EXTERNAL_DEPENDENCIES) == 1 -!IF [$(MAKE) /c MKDEP=1 /f Mkfiles\msvc.mak msvc.dep] == 0 +!IFDEF MKDEP +!IF EXISTS(msvc.dep) !INCLUDE msvc.dep -!ELSEIFNDEF MKDEP -!ERROR Unable to rebuild dependencies file msvc.dep !ENDIF +!ELSEIF [$(MAKE) /c MKDEP=1 /f Mkfiles\msvc.mak msvc.dep] == 0 +!INCLUDE msvc.dep +!ELSE +!ERROR Unable to rebuild dependencies file msvc.dep !ENDIF #-- Magic hints to mkdep.pl --# |