Merge pull request #156 from sourceryinstitute/small-build-fixes

zbeekman · zbeekman · commit 1f4ff6d67147 · 2016-03-05T13:06:28.000-05:00
Fix small CMake introspection issue &amp; exit status problems in install.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,7 +88,7 @@ else()
 endif()
 
 if(gfortran_compiler)
-  set(CMAKE_REQUIRED_FLAGS "-fcoarray=single")
+  set(CMAKE_REQUIRED_FLAGS "-fcoarray=single -ffree-form")
 endif()
 include(CheckFortranSourceCompiles)
 CHECK_Fortran_SOURCE_COMPILES("
diff --git a/install.sh b/install.sh
@@ -54,6 +54,9 @@
 #
 # __________ Process command-line arguments and environment variables _____________
 
+# Make sure we really exit with correct status when piping function output
+set -o pipefail
+
 this_script=`basename $0`
 
 # Interpret the first command-line argument, if present, as the OpenCoarrays installation path.

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@`
`54`	`54`	`#`
`55`	`55`	`# __________ Process command-line arguments and environment variables _____________`
`56`	`56`
	`57`	`+# Make sure we really exit with correct status when piping function output`
	`58`	`+set -o pipefail`
	`59`	`+`
`57`	`60`	this_script=`basename $0`
`58`	`61`
`59`	`62`	`# Interpret the first command-line argument, if present, as the OpenCoarrays installation path.`