From 56cfa90ddaaf9939926ff54b5f2f34e32254681e Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 1 Dec 2014 14:59:10 -0800 Subject: [PATCH] lsf configury: add dependent libraries for static linking Ensure to add the LSF dependent libraries and LD flags for the wrapper compiler static linking case. --- orte/mca/ess/lsf/configure.m4 | 5 ++++- orte/mca/plm/lsf/configure.m4 | 5 ++++- orte/mca/ras/lsf/configure.m4 | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/orte/mca/ess/lsf/configure.m4 b/orte/mca/ess/lsf/configure.m4 index b37c775e5a..262e7f690f 100644 --- a/orte/mca/ess/lsf/configure.m4 +++ b/orte/mca/ess/lsf/configure.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2007-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Los Alamos National Security, LLC. # All rights reserved. # $COPYRIGHT$ @@ -33,6 +33,9 @@ AC_DEFUN([MCA_orte_ess_lsf_CONFIG],[ [$1], [$2]) + $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS + $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS + # set build flags to use in makefile AC_SUBST([ess_lsf_CPPFLAGS]) AC_SUBST([ess_lsf_LDFLAGS]) diff --git a/orte/mca/plm/lsf/configure.m4 b/orte/mca/plm/lsf/configure.m4 index 78fd5b77f5..2e90012e5e 100644 --- a/orte/mca/plm/lsf/configure.m4 +++ b/orte/mca/plm/lsf/configure.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2013 Los Alamos National Security, LLC. # All rights reserved. # $COPYRIGHT$ @@ -33,6 +33,9 @@ AC_DEFUN([MCA_orte_plm_lsf_CONFIG],[ [$1], [$2]) + $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS + $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS + # set build flags to use in makefile AC_SUBST([plm_lsf_CPPFLAGS]) AC_SUBST([plm_lsf_LDFLAGS]) diff --git a/orte/mca/ras/lsf/configure.m4 b/orte/mca/ras/lsf/configure.m4 index 61b0bda8d5..d56310758f 100644 --- a/orte/mca/ras/lsf/configure.m4 +++ b/orte/mca/ras/lsf/configure.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2013 Los Alamos National Security, LLC. # All rights reserved. # $COPYRIGHT$ @@ -33,6 +33,9 @@ AC_DEFUN([MCA_orte_ras_lsf_CONFIG],[ [$1], [$2]) + $1_WRAPPER_EXTRA_LDFLAGS=[$]$1_LDFLAGS + $1_WRAPPER_EXTRA_LIBS=[$]$1_LIBS + # set build flags to use in makefile AC_SUBST([ras_lsf_CPPFLAGS]) AC_SUBST([ras_lsf_LDFLAGS])