~trn/dps8m

6cece39b0c179f910ee25e2a9be8acb2f9aaabe3 — Eric Swenson 2 months ago 82b48e8 + c193ce1
Merge branch 'bsd_env_ver_h_fix' into 'master'

A quick fix for non-POSIX BSD behavior when calling recursive make.

See merge request dps8m/dps8m!34
2 files changed, 3 insertions(+), 20 deletions(-)

M src/Makefile.mk
M src/dps8/GNUmakefile
M src/Makefile.mk => src/Makefile.mk +1 -17
@@ 113,7 113,7 @@ LD ?= clang
endif

###############################################################################
# Fallback for compiler: clang -> gcc -> cc -> pcc
# Fallback for compiler: clang -> gcc -> cc

ifeq ($(CC),clang)
ifneq ($(shell clang --version 2> /dev/null | $(GREP) -q "." 2> /dev/null && \


@@ 147,22 147,6 @@ LD = cc
endif
endif

ifeq ($(CC),cc)
ifneq ($(shell gcc --version 2> /dev/null | $(GREP) -q "." 2> /dev/null && \
	printf '%s\n' "1"),1)
CC = pcc
LD = pcc
endif
endif

ifeq ($(LD),cc)
ifneq ($(shell gcc --version 2> /dev/null | $(GREP) -q "." 2> /dev/null && \
	printf '%s\n' "1"),1)
CC = pcc
LD = pcc
endif
endif

ifeq ($(LD),ld)
LD = $(CC)
endif

M src/dps8/GNUmakefile => src/dps8/GNUmakefile +2 -3
@@ 397,8 397,7 @@ slte.inc : system_book_12_3.ascii
.PHONY: locallibs_then_dps8
locallibs_then_dps8: 
	@($(SETV); $(CD) "../decNumber" && $(MAKE))
	@$(SETV); $(ENV) MAKE="$(MAKE)" \
        $(MAKE) "ver.h"
	@$(SETV); MAKE="$(MAKE)" $(MAKE) "ver.h"
	@($(SETV); $(CD) $(SIMHx) && $(MAKE) -f "GNUmakefile")
	@$(SETV); $(MAKE) "dps8$(EXE)"



@@ 520,7 519,7 @@ kit dist:
	@$(PRINTF) '%s\n' "ARCHIVE: $(KITNAME).$(TARXT)"
	@$(SETV); $(RMF) ../../"$(KITNAME)"."$(TARXT)" || $(TRUE)
	@$(SETV); $(RMF) ../../"$(KITNAME)"."$(TARXT)"."$(COMPRESSXT)" || $(TRUE)
	@$(SETV); $(ENV) MAKE="$(MAKE)" $(MAKE) "ver.h"
	@$(SETV); MAKE="$(MAKE)" $(MAKE) "ver.h"
	@$(SETV); $(CP) "./ver.h" "./ver.h~"
	@$(SETV); ($(CD) "../.." && \
		$(MAKETAR) "$(KITNAME).$(TARXT)" $$( $(GIT) ls-files | \