Merge remote-tracking branch 'origin/7.0' into rtems5

2021-03-25 18:41:15 -05:00
parent fc4379595e f9ea6a5bff
commit 1c6b02b9be
74 changed files with 1272 additions and 668 deletions
@@ -38,6 +38,7 @@ ifeq ($(wildcard $(PERL_h)),)
 endif
 endif

+ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifeq ($(T_A),$(EPICS_HOST_ARCH))                 # No cross-builds (wrong Perl!)
 ifeq ($(strip $(XSUBPP)),)
  $(warning Perl's xsubpp program was not found.)
@@ -62,6 +63,7 @@ endif
 endif
 endif
 endif
+endif

 Cap5_SRCS = Cap5.xs
 Cap5_LIBS = ca Com