summaryrefslogtreecommitdiff
path: root/Mkfiles
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2017-11-08 11:06:39 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2017-11-08 11:06:39 -0800
commit9fd8a34938e942354fddab2ce14cbaa118264851 (patch)
tree89611f2ecde588ff26c9355b7bd416ba6f4b83bb /Mkfiles
parentd685bd2c4cf9b1fdeef1651575e3cfb7b5c23357 (diff)
downloadnasm-9fd8a34938e942354fddab2ce14cbaa118264851.tar.gz
msvc.mak: avoid infinite recursion on msvc.dep
We can't call $(MAKE) on msvc.dep if running that requires us to have msvc.dep... Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Mkfiles')
-rw-r--r--Mkfiles/msvc.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 711ca423..a29a869e 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -382,9 +382,9 @@ 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 msvc.dep] == 0
+!IF [$(MAKE) /c MKDEP=1 /f Mkfiles\msvc.mak msvc.dep] == 0
!INCLUDE msvc.dep
-!ELSE
+!ELSEIFNDEF MKDEP
!ERROR Unable to rebuild dependencies file msvc.dep
!ENDIF
!ENDIF