diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index ae52ef5a6df1cadb6b01eec31044957307d47fff..b12421ab8dcdbc2bf8637caedb5229881b0d90ea 100644 --- a/require-ess/tools/driver.makefile +++ b/require-ess/tools/driver.makefile @@ -114,16 +114,6 @@ HEADERS= BASH_ENV= ENV= -# There is no 64 bit support before 3.14.12 -ifneq ($(filter %_64,$(EPICS_HOST_ARCH)),) -ifeq ($(wildcard $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)),) -EPICS_HOST_ARCH:=$(patsubst %_64,%,$(EPICS_HOST_ARCH)) -USR_CFLAGS_$(EPICS_HOST_ARCH) += -m32 -USR_CXXFLAGS_$(EPICS_HOST_ARCH) += -m32 -USR_LDFLAGS_$(EPICS_HOST_ARCH) += -m32 -endif -endif - # Default target is "build" for all versions. # Don't install anything (different from default EPICS make rules). default: build @@ -194,13 +184,7 @@ USR_CPPFLAGS+=-DUSE_TYPED_RSET endif SHRLIB_VERSION= -# do not link *everything* with readline (and curses) -COMMANDLINE_LIBRARY = -# Relax (3.13) cross compilers (default is STRICT) to allow sloppier syntax. -CMPLR=STD -GCC_STD = $(GCC) -CXXCMPLR=ANSI -G++_ANSI = $(G++) -ansi + OBJ=.o COMMON_DIR = O.${EPICSVERSION}_Common