Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openfpm_pdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
argupta
openfpm_pdata
Commits
a7a0316a
Commit
a7a0316a
authored
7 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Patches
Plain Diff
fixing gin
parent
a6116719
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
build.sh
+4
-4
4 additions, 4 deletions
build.sh
script/detect_gcc
+30
-13
30 additions, 13 deletions
script/detect_gcc
with
34 additions
and
17 deletions
build.sh
+
4
−
4
View file @
a7a0316a
...
...
@@ -25,7 +25,7 @@ then
if
[
!
-d
$HOME
/
$5
/MPI
]
;
then
echo
"COPY MPICH"
cp
-R
$HOME
/MPI
_base
$HOME
/
$5
/MPI
cp
-R
$HOME
/MPI
$HOME
/
$5
/MPI
echo
1
>
$HOME
/
$5
/MPI/version
fi
...
...
@@ -35,16 +35,16 @@ then
mkdir
$HOME
/
$5
if
[
x
"
$4
"
==
x
"full"
]
;
then
./install
CC
=
gcc-4.9.2
CXX
=
g++-4.9.2
FC
=
gfortran-4.9.2
F77
=
gfortran-4.9.2
-i
$HOME
/
$5
-s
-c
"--prefix=/home/jenkins/openfpm_install"
CC
=
gcc-4.9.2
CXX
=
g++-4.9.2
FC
=
gfortran-4.9.2
F77
=
gfortran-4.9.2
./install
-i
$HOME
/
$5
-s
-c
"--prefix=/home/jenkins/openfpm_install"
mv
$HOME
/openfpm_vars
$HOME
/openfpm_vars_
$5
source
$HOME
/openfpm_vars_
$5
elif
[
x
"
$3
"
==
x
"numerics"
]
;
then
./install
-i
$HOME
/
$5
-m
-s
-c
"--prefix=/home/jenkins/openfpm_install"
CC
=
gcc-4.9.2
CXX
=
g++-4.9.2
FC
=
gfortran-4.9.2
F77
=
gfortran-4.9.2
./install
-i
$HOME
/
$5
-m
-s
-c
"--prefix=/home/jenkins/openfpm_install"
mv
$HOME
/openfpm_vars
$HOME
/openfpm_vars_
$5
source
$HOME
/openfpm_vars_
$5
make
$3
else
./install
-i
$HOME
/
$5
-m
-s
-c
"--prefix=/home/jenkins/openfpm_install --no-recursion"
CC
=
gcc-4.9.2
CXX
=
g++-4.9.2
FC
=
gfortran-4.9.2
F77
=
gfortran-4.9.2
./install
-i
$HOME
/
$5
-m
-s
-c
"--prefix=/home/jenkins/openfpm_install --no-recursion"
mv
$HOME
/openfpm_vars
$HOME
/openfpm_vars_
$5
source
$HOME
/openfpm_vars_
$5
make
$3
...
...
This diff is collapsed.
Click to expand it.
script/detect_gcc
+
30
−
13
View file @
a7a0316a
...
...
@@ -23,25 +23,42 @@ function detect_compiler()
dgc_ret
=
0
if
[
x
"
$CXX
"
!=
x
""
-o
x
"
$CC
"
!=
x
""
-o
x
"
$F77
"
!=
x
""
-o
x
"
$FC
"
!=
x
""
]
;
then
if
[
$CXX
]
if
[
x
"
$CXX
"
!=
x
""
-o
x
"
$CC
"
!=
x
""
-o
x
"
$F77
"
!=
x
""
-o
x
"
$FC
"
!=
x
""
]
;
then
if
[
x
"
$CXX
"
==
x
""
]
;
then
CXX
=
g++
fi
if
[
x
"
$CC
"
==
x
""
]
;
then
CC
=
gcc
fi
if
[
x
"
$FC
"
==
x
""
]
;
then
FC
=
gfortran
fi
if
[
x
"
$F77
"
==
x
""
]
;
then
F77
=
gfortran
fi
echo
-e
"
\0
33[1;34;5m ----------------------------------------------------------------------
\0
33[0m"
echo
-e
"
\0
33[1;34;5m Selected compilers
\0
33[0m"
echo
-e
"
\0
33[1;34;5m ----------------------------------------------------------------------
\0
33[0m"
echo
-e
"
\0
33[91;1m The user request to use specifics compilers to compile C/C++ or Fortran code
\0
33[0m"
echo
-e
"
\0
33[91;1m specifing one or more of these variables CXX/CC/F77/FC. When at least one is
\0
33[0m"
echo
-e
"
\0
33[91;1m The user request to use specifics compilers to compile C/C++ or Fortran code
\0
33[0m"
echo
-e
"
\0
33[91;1m specifing one or more of these variables CXX/CC/F77/FC. When at least one is
\0
33[0m"
echo
-e
"
\0
33[91;1m defined the specified compiler will be used.
\0
33[0m"
echo
-e
"
\0
33[91;1m When not specified the system will use the default g++/gcc/gfortran/gfortran
\0
33[0m"
echo
-e
"
\0
33[91;1m The installer will use the following compilers
\0
33[0m"
echo
-e
""
echo
-e
"CXX=
$CXX
"
echo
-e
"CC=
$CC
"
echo
-e
"F77=
$F77
"
echo
-e
"FC=
$FC
"
echo
-e
"
\0
33[91;1m When not specified the system will use the default g++/gcc/gfortran/gfortran
\0
33[0m"
echo
-e
"
\0
33[91;1m The installer will use the following compilers
\0
33[0m"
echo
-e
""
echo
-e
"CXX=
$CXX
"
echo
-e
"CC=
$CC
"
echo
-e
"F77=
$F77
"
echo
-e
"FC=
$FC
"
dgc_ret
=
1
dgc_compiler
=
$CXX
return
fi
...
...
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