chiark / gitweb /
mdw/cross.in, Makefile: Rename to simply `cross'.
authorMark Wooding <mdw@distorted.org.uk>
Wed, 22 Apr 2020 21:12:33 +0000 (22:12 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 22 Apr 2020 21:39:55 +0000 (22:39 +0100)
  * Rename the main program to `cross'.
  * Rename the environment variable to `$CROSS_BUILDENV'.
  * Change the generated-file banner to mention `CROSS', not `mdw-cross'.

Makefile
src/cross.in [moved from src/mdw-cross.in with 96% similarity]

index cc63a45554adeecd3c8a01c6a55e68000804fc53..4505f8334c5f1054c8d056a012ed9effb0548499 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ $(SETUPS): etc/%-setup.sh: $$(call setup-flavour,$$*)-setup.sh.in Makefile
        $(call v_tag,SED)sed 's/@arch@/$($*_ARCH)/g' $< >$@.new && \
                mv $@.new $@
 
-SCRIPTS                         = mdw-cross crosstool cross-run
+SCRIPTS                         = cross crosstool cross-run
 BINSCRIPTS              = $(addprefix bin/,$(SCRIPTS))
 TARGETS                        += $(BINSCRIPTS)
 $(BINSCRIPTS): bin/%: src/%.in
@@ -63,7 +63,7 @@ TARGETS                       += etc/config.sh
 etc/config.sh: Makefile
        $(V_AT)mkdir -p $(dir $@)
        $(call v_tag,GEN){ \
-               echo '### -*-sh-*- GENERATED by mdw-cross/Makefile'; \
+               echo '### -*-sh-*- GENERATED by CROSS/Makefile'; \
                $(foreach v,$(CONFIG_VARS), \
                        echo $(call fix,$v)=$(call quote,$(call quote,$($v)));) \
        } >$@.new && mv $@.new $@
@@ -85,12 +85,12 @@ run-program = exec 8>&1 && rc=$$( exec 7>&1 && \
 run: $(addprefix run/,$(ARCHS))
 $(addprefix run/,$(ARCHS)): run/%:
        @cd $(DIR) && \
-       $(call run-program,$(CROSSDIR)/bin/mdw-cross $* $(ARGS),$*)
+       $(call run-program,$(CROSSDIR)/bin/cross $* $(ARGS),$*)
 .PHONY: run $(addprefix run/,$(ARCHS))
 
 run-make: $(addprefix run-make/,$(ARCHS))
 $(addprefix run-make/,$(ARCHS)): run-make/%:
-       @+$(call run-program,$(CROSSDIR)/bin/mdw-cross $* $(MAKE) -C$(DIR) $(ARGS),$*)
+       @+$(call run-program,$(CROSSDIR)/bin/cross $* $(MAKE) -C$(DIR) $(ARGS),$*)
 .PHONY: run-make $(addprefix run-make/,$(ARCHS))
 
 show:; : $(VAR)
similarity index 96%
rename from src/mdw-cross.in
rename to src/cross.in
index f7ea08a9d9d27e1774a9545239dc3a6735ae16e1..f482d2802e652f26444d8fee1ee284d69484bc17 100644 (file)
@@ -25,7 +25,7 @@ while :; do
 done
 export CROSS_COMPILER_PREFIX
 
-MDW_BUILDENV=$env; export MDW_BUILDENV
+CROSS_BUILDENV=$env; export CROSS_BUILDENV
 
 if [ -f "$CROSSDIR/etc/$env-config.site" ]
 then CONFIG_SITE=$CROSSDIR/etc/$env-config.site