Skip to content
Snippets Groups Projects
Commit 64225f70 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Added docker test and started removing non-linux systems

	modified:   EXE/Makefile
	modified:   etc/Makefile.variables
parent 19757825
No related branches found
No related tags found
No related merge requests found
......@@ -78,15 +78,15 @@ MAKEREG=$(Csoft)/../$(MYOS)/bin/makereg
#endif
ifeq ($(MYOS),Linux)
override FFLAGS += -I$(Csoft)/INCLUDE
DISPFLAGS=$(FFLAGS)
ifeq ($(MYREALOS),Darwin)
OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib -lc -lm
else
#OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib -lc -lm -lnsl
OTHERLIBS += $(CERN_ROOT)/lib/libpacklib.a $(CERN_ROOT)/lib/libkernlib.a -lnsl -lcrypt -ldl -lgfortran
endif
OURLIBS := $(OURGENLIBS) $(LIBROOT)/libport.a
override FFLAGS += -I$(Csoft)/INCLUDE
DISPFLAGS=$(FFLAGS)
#OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib -lc -lm -lnsl
ifeq ($(RUNNING_DOCKER), true)
OTHERLIBS += /usr/lib/x86_64-linux-gnu/libpacklib.a /usr/lib/x86_64-linux-gnu/libkernlib.a -lnsl -lcrypt -ldl
else
OTHERLIBS += $(CERN_ROOT)/lib/libpacklib.a $(CERN_ROOT)/lib/libkernlib.a -lnsl -lcrypt -ldl -lgfortran
endif
OURLIBS := $(OURGENLIBS) $(LIBROOT)/libport.a
endif
#ifeq ($(MYOS),SunOS)
......
......@@ -26,6 +26,8 @@ CXX = g++
FC = gfortran
FFLAGS += $(g77flags)
RUNNING_DOCKER := $(shell if [[ -e "/.dockerenv" ]] ; then echo "true"; fi)
#ifeq ($(gccversion),4)
# ifeq ($(gccversion),4)
## ifeq ($(shell gfortran $(getversion)),4)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment