From deb8e8562a9ef96c0e062ed57a02328dcdc567f4 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Thu, 15 May 2003 20:07:44 +0000 Subject: [PATCH] Don't look for 'yacc' without an '.exe' extension on NT, because we might find the Cygwin script which isn't executable through the NT shell. [SVN r18404] --- historic/jam/src/build.jam | 10 ++++++++-- jam_src/build.jam | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/historic/jam/src/build.jam b/historic/jam/src/build.jam index 0dd7fc9b7..b14074019 100644 --- a/historic/jam/src/build.jam +++ b/historic/jam/src/build.jam @@ -376,8 +376,14 @@ actions .yyacc .yyacc jamgram.y jamgramtab.h : jamgram.yy ; # How to build the grammar. -yacc ?= [ GLOB $(PATH) : yacc yacc.exe ] ; -yacc ?= [ GLOB $(PATH) : bison bison.exe ] ; +if $(NT) +{ + local SUFEXE = .exe ; +} + +SUFEXE ?= "" ; +yacc ?= [ GLOB $(PATH) : yacc$(SUFEXE) ] ; +yacc ?= [ GLOB $(PATH) : bison$(SUFEXE) ] ; yacc = $(yacc[1]) ; switch $(yacc:D=:S=) { diff --git a/jam_src/build.jam b/jam_src/build.jam index 0dd7fc9b7..b14074019 100644 --- a/jam_src/build.jam +++ b/jam_src/build.jam @@ -376,8 +376,14 @@ actions .yyacc .yyacc jamgram.y jamgramtab.h : jamgram.yy ; # How to build the grammar. -yacc ?= [ GLOB $(PATH) : yacc yacc.exe ] ; -yacc ?= [ GLOB $(PATH) : bison bison.exe ] ; +if $(NT) +{ + local SUFEXE = .exe ; +} + +SUFEXE ?= "" ; +yacc ?= [ GLOB $(PATH) : yacc$(SUFEXE) ] ; +yacc ?= [ GLOB $(PATH) : bison$(SUFEXE) ] ; yacc = $(yacc[1]) ; switch $(yacc:D=:S=) {