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 AEB7D1F462 for ; Mon, 29 Jul 2019 20:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730268AbfG2UIN (ORCPT ); Mon, 29 Jul 2019 16:08:13 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:34537 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730178AbfG2UIF (ORCPT ); Mon, 29 Jul 2019 16:08:05 -0400 Received: by mail-wm1-f65.google.com with SMTP id w9so43753120wmd.1 for ; Mon, 29 Jul 2019 13:08: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=sjfaeQQw5fKzwV98hkdiDakmOYw40m+7r8TpfP3lfPKqmhgjFGv5kTydZ/clgigiec W0mpt/hAE8nU1CcZybViJ2wH2o7MP72FtkISa9x5ynSDSrqk9EY/PSvoxBuy04RslsM3 WX74dv3oQc3EU3pC0xoQnU5V6juVilBCq8RioC8CHxRVUKbZd0DIWN/oC/Dy7tpU64zp Udwa5wVHE/JjKWphHPJIKZxz/uXfozgvxssF8w7TKVD2Cu6MB/hvUTI33UFNYikN8IT8 q5QdVyR1UveTZOISJ4kIbIxp01dmxwHDfY5O3wVRZwOdKQu8Ot56VS17NCR7ymeV+teF vxjA== 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=bbbHv6+A8Zv7JffMTeNRwwkB4urOTxMY3mmVuQrjusTvL5g1RGTgzH61I1hVQdjMJx xWHaOulnbvJA+MwbiRwdUZeXymny0Pu1OPBiJl4QK2y6EXhHUcjjnK+jxqDtY4cYyTEX BwJW/33jAdBx9aT/vSj0BZetQSrnmp8x5XWozxtxpM68dlPhuoueB38rP82DOmosLgjP gQ2xkGtl7PspoULnLYKG7a8TkoOmPpOqx/uOwwJzNTjzYEasxxlcyOZQFpgawRzk6QI4 IvmBc+lf5OcQByeu+WrkYdC6FDS1/H1vK8f4gkzzVjxbAeHrimPFMIC6D+R42BejDdqz zWmg== X-Gm-Message-State: APjAAAXe3PDU/NUaoA8hhL9eXVXVqeuOeIAo3Hey4YjcaRiaRrG79r5u JKH3kvItY01DJxnmPBZhZN3B8DSe X-Google-Smtp-Source: APXvYqyt5z0HVrz/l9WPSOcWqfiSW59QhGg+AuxUzSFpqc6XQswL8Sd0yjC/b5RqjbFKNe/wbN7hRg== X-Received: by 2002:a1c:f20f:: with SMTP id s15mr25323319wmc.33.1564430884372; Mon, 29 Jul 2019 13:08:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w67sm80298598wma.24.2019.07.29.13.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:03 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:03 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:41 GMT Message-Id: <82e820017b6ab7ce8612742a85679ea837d3596b.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 05/23] 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