Fixes #3496: Move wrapper orte fix to 1.7 v1.7
authorjsquyres
Mon Feb 04 17:36:55 2013 +0000 (3 months ago)
branchv1.7
changeset 21369f8b3077e6edf
parent 21366 b9158218ddf4
child 21372 7a486c104aec
Fixes #3496: Move wrapper orte fix to 1.7

---svn-pre-commit-ignore-below---

Custom patch on ticket based on:

r27972 [[BR]]
Need the WRAPPER_EXTRA_* defines for orte_info as well.
opal/config/opal_setup_wrappers.m4
     1.1 --- a/opal/config/opal_setup_wrappers.m4	Sun Feb 03 14:51:00 2013 +0000
     1.2 +++ b/opal/config/opal_setup_wrappers.m4	Mon Feb 04 17:36:55 2013 +0000
     1.3 @@ -241,6 +241,21 @@
     1.4           AC_CONFIG_FILES([orte/tools/wrappers/orte_wrapper_script],
     1.5                           [chmod +x orte/tools/wrappers/orte_wrapper_script])
     1.6         fi
     1.7 +
     1.8 +       m4_ifdef([project_ompi], [], [
     1.9 +          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$ORTE_WRAPPER_EXTRA_CFLAGS",
    1.10 +              [Additional CFLAGS to pass through the wrapper compilers])
    1.11 +          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS_PREFIX, "$ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX",
    1.12 +              [Additional CFLAGS_PREFIX to pass through the wrapper compilers])
    1.13 +          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS, "$ORTE_WRAPPER_EXTRA_CXXFLAGS",
    1.14 +              [Additional CXXFLAGS to pass through the wrapper compilers])
    1.15 +          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS_PREFIX, "$ORTE_WRAPPER_EXTRA_CXXFLAGS_PREFIX",
    1.16 +              [Additional CXXFLAGS_PREFIX to pass through the wrapper compilers])
    1.17 +          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$ORTE_WRAPPER_EXTRA_LDFLAGS",
    1.18 +              [Additional LDFLAGS to pass through the wrapper compilers])
    1.19 +          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$ORTE_WRAPPER_EXTRA_LIBS",
    1.20 +              [Additional LIBS to pass through the wrapper compilers])
    1.21 +       ])
    1.22      ])
    1.23  
    1.24      m4_ifdef([project_ompi], [