From cb76d93b4e616b9d1411c28fe0848cce2e374fbf Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 19 Oct 2016 09:56:11 +0900 Subject: [PATCH] ompi_wrapper_script: fix $extra_ldflags use @OMPI_PKG_CONFIG_LDFLAGS@ instead of @OMPI_WRAPPER_EXTRA_LDFLAGS@ so @{libdir} is substitued with ${libdir} Thanks Manesh Nanavalla for the report --- ompi/tools/wrappers/ompi_wrapper_script.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in index 2d0cfb2ae3..0822a5843c 100644 --- a/ompi/tools/wrappers/ompi_wrapper_script.in +++ b/ompi/tools/wrappers/ompi_wrapper_script.in @@ -8,6 +8,8 @@ # Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013 Sandia National Laboratories. All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -41,7 +43,7 @@ my $extra_cxxflags = "@OMPI_WRAPPER_EXTRA_CXXFLAGS@"; my $extra_cxxflags_prefix = "@OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX@"; my $extra_fcflags = "@OMPI_WRAPPER_EXTRA_FCFLAGS@"; my $extra_fcflags_prefix = "@OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX@"; -my $extra_ldflags = "@OMPI_WRAPPER_EXTRA_LDFLAGS@"; +my $extra_ldflags = "@OMPI_PKG_CONFIG_LDFLAGS@"; my $extra_libs = "@OMPI_WRAPPER_EXTRA_LIBS@"; my $cxx_lib = "@OMPI_WRAPPER_CXX_LIB@"; my $fc_module_flag = "@OMPI_FC_MODULE_FLAG@";