From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id B914F3857C4F; Thu, 13 Jan 2022 16:50:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B914F3857C4F MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6555] libgfortran: Fix Solaris version file creation [PR104006] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 9d8e27fac3c6426fbfaf30d51cbf2761c5491a6a X-Git-Newrev: 70ba28304b7ff91761db248bc8354eda8e9a4796 Message-Id: <20220113165042.B914F3857C4F@sourceware.org> Date: Thu, 13 Jan 2022 16:50:42 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jan 2022 16:50:42 -0000 https://gcc.gnu.org/g:70ba28304b7ff91761db248bc8354eda8e9a4796 commit r12-6555-g70ba28304b7ff91761db248bc8354eda8e9a4796 Author: Jakub Jelinek Date: Thu Jan 13 17:45:58 2022 +0100 libgfortran: Fix Solaris version file creation [PR104006] I forgot to change the gfortran.map-sun goal to gfortran.ver-sun when changing other spots for the preprocessed version file. 2022-01-13 Jakub Jelinek PR libfortran/104006 * Makefile.am (gfortran.map-sun): Rename target to ... (gfortran.ver-sun): ... this. * Makefile.in: Regenerated. Diff: --- libgfortran/Makefile.am | 2 +- libgfortran/Makefile.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 00745403bbb..43f91d5bbf5 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -23,7 +23,7 @@ endif if LIBGFOR_USE_SYMVER_SUN version_arg = -Wl,-M,gfortran.ver-sun version_dep = gfortran.ver-sun gfortran.ver -gfortran.map-sun : gfortran.ver \ +gfortran.ver-sun : gfortran.ver \ $(top_srcdir)/../contrib/make_sunver.pl \ $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) perl $(top_srcdir)/../contrib/make_sunver.pl \ diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index cf500a002e8..fc44ab53a19 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -719,7 +719,6 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -7616,7 +7615,7 @@ uninstall-am: uninstall-cafexeclibLTLIBRARIES uninstall-gfor_cHEADERS \ @LIBGFOR_USE_SYMVER_TRUE@gfortran.ver: $(srcdir)/gfortran.map kinds.inc @LIBGFOR_USE_SYMVER_TRUE@ $(EGREP) -v '#(#| |$$)' $< | \ @LIBGFOR_USE_SYMVER_TRUE@ $(PREPROCESS) -P -include config.h -include kinds.inc - > $@ || (rm -f $@ ; exit 1) -@LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@gfortran.map-sun : gfortran.ver \ +@LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@gfortran.ver-sun : gfortran.ver \ @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@ $(top_srcdir)/../contrib/make_sunver.pl \ @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@ $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) @LIBGFOR_USE_SYMVER_SUN_TRUE@@LIBGFOR_USE_SYMVER_TRUE@ perl $(top_srcdir)/../contrib/make_sunver.pl \