[gcc-7] 183/354: * Fix building libgfortran when building without common libs.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 67f2a5a7cc218ad6dbcb4f0bfcc7463861b423a3
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat May 6 10:09:29 2017 +0000

      * Fix building libgfortran when building without common libs.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9448 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                 | 1 +
 debian/rules.d/binary-fortran.mk | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3d320c3..b6bc8a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-7 (7.1.0-5) UNRELEASED; urgency=medium
 
   * Disable offload compilers for snapshot builds.
   * Build libgo when not building common libs.
+  * Fix building libgfortran when building without common libs.
 
  -- Matthias Klose <doko at debian.org>  Fri, 05 May 2017 13:47:57 +0200
 
diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk
index 32be526..4b603e4 100644
--- a/debian/rules.d/binary-fortran.mk
+++ b/debian/rules.d/binary-fortran.mk
@@ -105,7 +105,8 @@ define __do_fortran
 		$(call shlibdirs_to_search, \
 			$(subst gfortran$(FORTRAN_SONAME),gcc$(GCC_SONAME),$(p_l)) \
 			$(subst gfortran$(FORTRAN_SONAME),gcc$(QUADMATH_SONAME),$(p_l)) \
-		,$(2))
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git