File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
prerequisites/build-functions Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change
1
+ # shellcheck shell=bash
1
2
# Make the build directory, configure, and build
2
3
# shellcheck disable=SC2154
3
4
@@ -50,11 +51,10 @@ build_and_install()
50
51
# Patch gfortran if necessary
51
52
export patches_dir=" ${OPENCOARRAYS_SRC_DIR} /prerequisites/build-functions/patches/${package_to_build} /${version_to_build} "
52
53
if [[ -d " ${patches_dir:- } " ]]; then
53
- # TODO: check whether multiple patch files exist in $patches_dir and apply each one
54
- export patch_file=" $( ls " $patches_dir " ) "
55
- info " Applying patch $patch_file to $package_to_build ${version_to_build} ."
56
- patch_file=" ${patches_dir:- } /$patch_file "
57
- patch -p1 < " $patch_file "
54
+ for patch in " ${patches_dir%/ } " * .diff ; do
55
+ info " Applying patch ${patch##*/ } to $package_to_build ${version_to_build} ."
56
+ patch -p1 < " $patch "
57
+ done
58
58
fi
59
59
60
60
# Use GCC's contrib/download_prerequisites script after modifying it, if necessary, to use the
You can’t perform that action at this time.
0 commit comments