From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id CE51B1F461 for ; Thu, 18 Jul 2019 13:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390486AbfGRNTM (ORCPT ); Thu, 18 Jul 2019 09:19:12 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:55431 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbfGRNTG (ORCPT ); Thu, 18 Jul 2019 09:19:06 -0400 Received: by mail-wm1-f65.google.com with SMTP id a15so25558731wmj.5 for ; Thu, 18 Jul 2019 06:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=MswVhO2Yoph6d7/DqSxFIx79+SyDFpptAibZXsGzuXc=; b=PybcT27zwXUVBF2P+iYhnTD+c/eXnSVpfMGC2dvYwSVjJSzfAwjIb/e0+a9/2NS8s0 sFDsR99Wa5dQhdFfPa3jV2dSBSvlEPW2huq3R/+o/Cs0bS0Heh2wc8/DfNIAqoHpkEgk jV9WAn7K+8ssegMsQzok6PThHxjBxa1/0IQrGN7m6/JnuoYNa5NgMiWiHNMddTqk8mvV AMGwRkKp8IKuUcDlZM20NthREoulezjXa/exe/EVRQ4kbJsyqZHGPPpRy6QNJWl0mvE7 FnVlhNL3+HA997UxMvSiYS09f4LEyo6lDiTyhqepx6NM9ksw68QDJ3mzuBW4R82r2Saa M/kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=MswVhO2Yoph6d7/DqSxFIx79+SyDFpptAibZXsGzuXc=; b=ZMyNEbLmKniesQZOeWxxFUwBIulwcoY435mbbqd+jdZBokVL634HGV2TdLB3U6O9ky izXzTqMWlLS7iUhtyzRctBbUlBDgOG6WYnCCc+MIJP06NsrTFVidDuGYH4/I/B0hq40j 2yEXaHP9n5tqxpO5UiDPF8Yrpchyc3NJRL49zOi6S+cAcoEsp/7FDhU33oEBKuBdgPgk utMVhYQlwuiyUZw5ZYo5qcBdUS317aYG+1r0Dv/5RbZUUI5cvfuDrc3zIUKfej4lZaU4 JZCq7+kvH2rCPd2SH+4E+qveBo2JM9RKaN5BxEXOuFH2tdBIH9PIfBXjIcK0JdVyPZ2/ q6cw== X-Gm-Message-State: APjAAAWaCNDsmZ2+ExHqJwBXHOabcHR8VhZfaGjtv8tFbWSJbNfRgGye ztXeVbjO5U5TE2MbYLp1y3SDJPIY X-Google-Smtp-Source: APXvYqw2kMN1ItIfc8gnymEjEfl/W6BG5+D886PqVdfXdpZQYRloCg3a6bwfI2qQsT3SPSfScaVl6Q== X-Received: by 2002:a7b:c5c2:: with SMTP id n2mr41515281wmk.92.1563455944550; Thu, 18 Jul 2019 06:19:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v23sm24190622wmj.32.2019.07.18.06.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:04 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:04 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:40 GMT Message-Id: <82e820017b6ab7ce8612742a85679ea837d3596b.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 05/24] contrib/buildsystems: ignore invalidcontinue.obj Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philip Oakley Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also only substitute filenames ending with .o when generating the source .c filename, otherwise we would start to expect .cbj files to generate .obj files (which are not generated by our build)... In the future there may be source files that produce .obj files so keep the two issues (.obj files with & without source files) separate. Signed-off-by: Philip Oakley Signed-off-by: Duncan Smart Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 23da787dc5..53e65d4db7 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -282,7 +282,7 @@ sub handleLibLine # exit(1); foreach (@objfiles) { my $sourcefile = $_; - $sourcefile =~ s/\.o/.c/; + $sourcefile =~ s/\.o$/.c/; push(@sources, $sourcefile); push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}}); push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}}); @@ -326,8 +326,12 @@ sub handleLinkLine } elsif ($part =~ /\.(a|lib)$/) { $part =~ s/\.a$/.lib/; push(@libs, $part); - } elsif ($part =~ /\.(o|obj)$/) { + } elsif ($part eq 'invalidcontinue.obj') { + # ignore - known to MSVC + } elsif ($part =~ /\.o$/) { push(@objfiles, $part); + } elsif ($part =~ /\.obj$/) { + # do nothing, 'make' should not be producing .obj, only .o files } else { die "Unhandled lib option @ line $lineno: $part"; } @@ -336,7 +340,7 @@ sub handleLinkLine # exit(1); foreach (@objfiles) { my $sourcefile = $_; - $sourcefile =~ s/\.o/.c/; + $sourcefile =~ s/\.o$/.c/; push(@sources, $sourcefile); push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}}); push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}}); -- gitgitgadget