From a3af7d6dbb769a2331e887210158981f66df8c31 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 3 Dec 2014 13:32:42 -0800 Subject: [PATCH] Revert "lsf configury: add dependent libraries for static linking" This reverts commit 56cfa90ddaaf9939926ff54b5f2f34e32254681e. --- orte/mca/ess/lsf/configure.m4 | 5 +---- orte/mca/plm/lsf/configure.m4 | 5 +---- orte/mca/ras/lsf/configure.m4 | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/orte/mca/ess/lsf/configure.m4 b/orte/mca/ess/lsf/configure.m4 index 262e7f690f..b37c775e5a 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-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011 Los Alamos National Security, LLC. # All rights reserved. # $COPYRIGHT$ @@ -33,9 +33,6 @@ 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 2e90012e5e..78fd5b77f5 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-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2013 Los Alamos National Security, LLC. # All rights reserved. # $COPYRIGHT$ @@ -33,9 +33,6 @@ 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 d56310758f..61b0bda8d5 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-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2011-2013 Los Alamos National Security, LLC. # All rights reserved. # $COPYRIGHT$ @@ -33,9 +33,6 @@ 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])