Jeff Squyres avatar Jeff Squyres committed f8b3077 Draft

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.

Comments (0)

Files changed (1)

opal/config/opal_setup_wrappers.m4

          AC_CONFIG_FILES([orte/tools/wrappers/orte_wrapper_script],
                          [chmod +x orte/tools/wrappers/orte_wrapper_script])
        fi
+
+       m4_ifdef([project_ompi], [], [
+          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS, "$ORTE_WRAPPER_EXTRA_CFLAGS",
+              [Additional CFLAGS to pass through the wrapper compilers])
+          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CFLAGS_PREFIX, "$ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX",
+              [Additional CFLAGS_PREFIX to pass through the wrapper compilers])
+          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS, "$ORTE_WRAPPER_EXTRA_CXXFLAGS",
+              [Additional CXXFLAGS to pass through the wrapper compilers])
+          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_CXXFLAGS_PREFIX, "$ORTE_WRAPPER_EXTRA_CXXFLAGS_PREFIX",
+              [Additional CXXFLAGS_PREFIX to pass through the wrapper compilers])
+          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LDFLAGS, "$ORTE_WRAPPER_EXTRA_LDFLAGS",
+              [Additional LDFLAGS to pass through the wrapper compilers])
+          AC_DEFINE_UNQUOTED(WRAPPER_EXTRA_LIBS, "$ORTE_WRAPPER_EXTRA_LIBS",
+              [Additional LIBS to pass through the wrapper compilers])
+       ])
     ])
 
     m4_ifdef([project_ompi], [
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.