Skip to content
Snippets Groups Projects
Commit 311d62e5 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Merge branch 'script_devel' into 'master'

Fix bug in USE_MAGMA and USE_CUBLAS option flags

See merge request giacomo.mulas/np_tmcode!71
parents 777e5ac7 7ba3a2ed
No related branches found
No related tags found
No related merge requests found
......@@ -145,4 +145,4 @@ clean:
wipe:
rm -rf $(FORTRAN_OBJS) $(NP_LIBNPTM_OBJS) $(NP_CLUSTER_OBJS) $(NP_INCLUSION_OBJS) $(NP_SPHERE_OBJS) $(NP_TRAPPING_OBJS) $(NP_TESTING_OBJS)
rm -rf $(FORTRAN_BINS) $(NPTM_LIB) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)
rm -rf $(FORTRAN_BINS) libnptm/libnptm.a libnptm/libnptm.so $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)
......@@ -120,7 +120,7 @@ function test_legacy_fortran {
J=I-I
END
EOF
$1 -std=legacy conf_test_fortran.f -o conf_test_fortran > /dev/null 2>error.log
$1 -std=legacy conf_test_fortran.f -o conf_test_fortran > /dev/null 2>>error.log
result=$?
rm conf_test_fortran.f
if [ "x$result" = "x0" ]; then
......@@ -233,7 +233,7 @@ echo -n "configure: checking for ar... "
if [ "x$AR" = "x" ]; then
AR="ar"
fi
$AR --version > /dev/null 2>error.log
$AR --version > /dev/null 2>>error.log
result=$?
if [ "x$result" = "x0" ]; then
echo "$AR"
......@@ -268,7 +268,7 @@ else
J=I-I
END
EOF
$FC -ggdb test_fortran.f -o test_fortran > /dev/null 2>error.log
$FC -ggdb test_fortran.f -o test_fortran > /dev/null 2>>error.log
result=$?
if [ "x$result" = "x0" ]; then
echo "yes"
......@@ -316,7 +316,7 @@ int main() {
return (i + j);
}
EOF
$CXX $CLANGFLAGS test_compiler.cpp -o test_compiler > /dev/null 2>error.log
$CXX $CLANGFLAGS test_compiler.cpp -o test_compiler > /dev/null 2>>error.log
result=$?
if [ "x$result" = "x0" ]; then
echo "yes"
......@@ -326,7 +326,7 @@ else
exit 2
fi
echo -n "configure: checking wether $CXX supports -ggdb... "
$CXX $CLANGFLAGS -ggdb test_compiler.cpp -o test_compiler > /dev/null 2>error.log
$CXX $CLANGFLAGS -ggdb test_compiler.cpp -o test_compiler > /dev/null 2>>error.log
result=$?
if [ "x$result" = "x0" ]; then
echo "yes"
......@@ -357,7 +357,7 @@ int main() {
return result;
}
EOF
$CXX test_compiler.cpp -o test_compiler > /dev/null 2>error.log
$CXX test_compiler.cpp -o test_compiler > /dev/null 2>>error.log
result=$?
if [ "x$result" = "x0" ]; then
./test_compiler
......@@ -385,7 +385,7 @@ int main() {
return result;
}
EOF
$CXX -fopenmp test_compiler.cpp -o test_compiler > /dev/null 2>error.log
$CXX -fopenmp test_compiler.cpp -o test_compiler > /dev/null 2>>error.log
result=$?
if [ "x$result" = "x0" ]; then
./test_compiler
......@@ -767,7 +767,7 @@ EOF
result=$?
rm conf_test_offload.cpp
if [ "x$result" = "x0" ]; then
./conf_test_offload > /dev/null 2>error.log
./conf_test_offload > /dev/null 2>>error.log
result=$?
rm conf_test_offload
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment