Skip to content

Commit

Permalink
Merge pull request open-mpi#652 from miked-mellanox/topic/v1.10_build…
Browse files Browse the repository at this point in the history
…_patch_dir

BUILD: allow specifying platform patch_dir from cmd line
  • Loading branch information
jsquyres committed Oct 8, 2015
2 parents 0168ab4 + 6fc4dd8 commit 578164c
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion config/ompi_load_platform.m4
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
# OMPI_LOAD_PLATFORM()
# --------------------
AC_DEFUN([OMPI_LOAD_PLATFORM], [
AC_ARG_WITH([platform-patches-dir],
[AC_HELP_STRING([--with-platform-patches-dir=DIR],
[Location of the platform patches directory. If you use this option, you must also use --with-platform.])])

AC_ARG_WITH([platform],
[AC_HELP_STRING([--with-platform=FILE],
[Load options for build from FILE. Options on the
Expand Down Expand Up @@ -94,7 +98,12 @@ AC_DEFUN([OMPI_LOAD_PLATFORM], [
AC_SUBST(OPAL_PARAM_FROM_PLATFORM, "no")
fi

patch_dir="${with_platform}.patches"
if test -d "$with_platform_patches_dir"; then
patch_dir=$with_platform_patches_dir
else
patch_dir="${with_platform}.patches"
fi

patch_done="${srcdir}/.platform_patches"
patch_found=no

Expand Down

0 comments on commit 578164c

Please sign in to comment.