shithub: scc

Info  •  Files  •  Log  •  Branches

Fix $(ENV) generation

Using a subshell was hidding the return code
from the echo commands. With this new structure
failures from them are cached by trap.

--- a/Makefile

+++ b/Makefile

@@ -20,12 +20,13 @@

 $(ENV):

 	@rm -f $@; \

 	trap 'r=$?;rm -f $$$$.tmp;exit $r' EXIT HUP INT QUIT TERM; \

-	(echo PATH=$$PWD/scripts:$$PATH:.; \

-	 echo NM=\"$(NM)\"; \

-	 echo AR=\"$(AR)\"; \

-	 echo RL=\"$(RL)\"; \

-	 echo RLFLAGS=\"$(RLFLAGS)\"; \

-	 echo export PATH RLFLAGS NM AR RL) > $$$$.tmp && mv $$$$.tmp $@

+	echo PATH=$$PATH:$$PWD/$(SCRIPTDIR):. > $$$$.tmp && \

+	echo NM=\"$(NM)\" >> $$$$.tmp && \

+	echo AR=\"$(AR)\" >> $$$$.tmp && \

+	echo RL=\"$(RL)\" >> $$$$.tmp && \

+	echo RLFLAGS=\"$(RLFLAGS)\" >> $$$$.tmp && \

+	echo export PATH RLFLAGS NM AR RL >> $$$$.tmp && \

+	mv $$$$.tmp $@

 dep:

 	$(FORALL)