In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/bd8b97a1c6412e18b21f72deb748e7e6c9a755e8?hp=bc2161fd173adec3ad63b07a52ee224c89a45a4c>
- Log ----------------------------------------------------------------- commit bd8b97a1c6412e18b21f72deb748e7e6c9a755e8 Author: Tony Cook <[email protected]> Date: Wed Apr 1 16:40:33 2015 +1100 fix dmake test for gcc a752046a added TESTPREPGCC to allow VC++ builds to succeed, but unfortunately defined TESTPREPGCC after use, which meant the test-prep-gcc target wasn't being treated as a dependency. Define TESTPREPGCC earlier. ----------------------------------------------------------------------- Summary of changes: win32/makefile.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/win32/makefile.mk b/win32/makefile.mk index 34dd7e9..eb44828 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -513,6 +513,8 @@ LIBOUT_FLAG = BUILDOPT += -fno-strict-aliasing -mms-bitfields MINIBUILDOPT += -fno-strict-aliasing +TESTPREPGCC = test-prep-gcc + .ELSE # All but the free version of VC++ 7.x can load DLLs on demand. Makes the test @@ -658,6 +660,8 @@ OBJOUT_FLAG = -Fo EXEOUT_FLAG = -Fe LIBOUT_FLAG = /out: +TESTPREPGCC = + .ENDIF CFLAGS_O = $(CFLAGS) $(BUILDOPT) @@ -1631,15 +1635,14 @@ test-prep : all utils ..\pod\perltoc.pod $(TESTPREPGCC) # Without this copying, the op/taint.t test script will fail. .IF "$(CCTYPE)" == "GCC" -TESTPREPGCC = test-prep-gcc + test-prep-gcc : if exist $(CCDLLDIR)\libgcc_s_seh-1.dll $(XCOPY) $(CCDLLDIR)\libgcc_s_seh-1.dll ..\t\$(NULL) if exist $(CCDLLDIR)\libgcc_s_sjlj-1.dll $(XCOPY) $(CCDLLDIR)\libgcc_s_sjlj-1.dll ..\t\$(NULL) if exist $(CCDLLDIR)\libgcc_s_dw2-1.dll $(XCOPY) $(CCDLLDIR)\libgcc_s_dw2-1.dll ..\t\$(NULL) if exist $(CCDLLDIR)\libstdc++-6.dll $(XCOPY) $(CCDLLDIR)\libstdc++-6.dll ..\t\$(NULL) if exist $(CCDLLDIR)\libwinpthread-1.dll $(XCOPY) $(CCDLLDIR)\libwinpthread-1.dll ..\t\$(NULL) -.ELSE -TESTPREPGCC = + .ENDIF test : test-prep -- Perl5 Master Repository
