Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Analyzer_new
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Whitney Armstrong
Analyzer_new
Commits
64225f70
Commit
64225f70
authored
7 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
Added docker test and started removing non-linux systems
modified: EXE/Makefile modified: etc/Makefile.variables
parent
19757825
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
EXE/Makefile
+9
-9
9 additions, 9 deletions
EXE/Makefile
etc/Makefile.variables
+2
-0
2 additions, 0 deletions
etc/Makefile.variables
with
11 additions
and
9 deletions
EXE/Makefile
+
9
−
9
View file @
64225f70
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
etc/Makefile.variables
+
2
−
0
View file @
64225f70
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment