Reverted back to using OR for cmp/mv operations for lex/yacc output.

The shell AND/OR operators short-circuit on command success/failure, which is
the inverse of exit status (i.e. 0 means success, non-zero means failure).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7616 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index 0eb4b885fc447a24b483793a6829f2fe4a0f6e45..3c1d0c8577056146512f48f407c3ea85e605e309 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -773,7 +773,7 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
           $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
           $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \
               > $@.tmp
-       $(VERB) cmp $@ $@.tmp > /dev/null && ${MV} -f $@.tmp $@
+       $(VERB) cmp $@ $@.tmp > /dev/null || ${MV} -f $@.tmp $@
        @# remove the output of flex if it didn't get moved over...
        @rm -f $@.tmp
 
@@ -783,8 +783,8 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
 %.cpp %.h : %.y
        @echo Bison\'ing $<...
        $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
-       $(VERB) cmp $*.tab.c $*.cpp > /dev/null && ${MV} -f $*.tab.c $*.cpp
-       $(VERB) cmp $*.tab.h $*.h > /dev/null && ${MV} -f $*.tab.h $*.h
+       $(VERB) cmp $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
+       $(VERB) cmp $*.tab.h $*.h > /dev/null || ${MV} -f $*.tab.h $*.h
        @# If the files were not updated, don't leave them lying around...
        @rm -f $*.tab.c $*.tab.h
 

diff --git a/Makefile.rules b/Makefile.rules
index 0eb4b885fc447a24b483793a6829f2fe4a0f6e45..3c1d0c8577056146512f48f407c3ea85e605e309 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -773,7 +773,7 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
           $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
           $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \
               > $@.tmp
-       $(VERB) cmp $@ $@.tmp > /dev/null && ${MV} -f $@.tmp $@
+       $(VERB) cmp $@ $@.tmp > /dev/null || ${MV} -f $@.tmp $@
        @# remove the output of flex if it didn't get moved over...
        @rm -f $@.tmp
 
@@ -783,8 +783,8 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
 %.cpp %.h : %.y
        @echo Bison\'ing $<...
        $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
-       $(VERB) cmp $*.tab.c $*.cpp > /dev/null && ${MV} -f $*.tab.c $*.cpp
-       $(VERB) cmp $*.tab.h $*.h > /dev/null && ${MV} -f $*.tab.h $*.h
+       $(VERB) cmp $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
+       $(VERB) cmp $*.tab.h $*.h > /dev/null || ${MV} -f $*.tab.h $*.h
        @# If the files were not updated, don't leave them lying around...
        @rm -f $*.tab.c $*.tab.h