From patchwork Wed Sep 2 20:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11751717 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62452161F for ; Wed, 2 Sep 2020 20:16:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A33020C56 for ; Wed, 2 Sep 2020 20:16:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uiV2IXhb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726323AbgIBUQm (ORCPT ); Wed, 2 Sep 2020 16:16:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbgIBUQm (ORCPT ); Wed, 2 Sep 2020 16:16:42 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 614E6C061244 for ; Wed, 2 Sep 2020 13:16:41 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id z4so732411wrr.4 for ; Wed, 02 Sep 2020 13:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:date:subject:fcc:content-transfer-encoding :mime-version:to:cc; bh=2lo+LuM7Rl5YAHNhjvd0n/lh7ybSatYjuFayPoUIwDQ=; b=uiV2IXhbHEWs4BZ9oNUwTsLC8CtptgAP7xjN2Obktui1+chNqRKmkz3jbQUOVEkP5J Axgtc17xcvFfRN5o0tfp57QAkzKETliMAsla7MSD1cxSI9R/31nsNj+v6yCfkMgmlJkj cJza+jaQthlkRZooT0R962yVxhNd1v0i+/z6N5mxn2nhw0xOmL5N87IByG/BMz39YcKS ObfAvaFV2AELFNBad92vu9GyGkJeTIwMoxjzUjR4aTPqq4P9ZysKnrs+f2GdNmc/eYxZ RkeeAVdY+CbRpf2PxEwXOAlJbyUZpebxw0svMpPv9/6+/kBrLtZzBFQAAv26Ok7YBnh3 KgnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=2lo+LuM7Rl5YAHNhjvd0n/lh7ybSatYjuFayPoUIwDQ=; b=d21nvMONDH9WK+srCbmDuIlNOvuDCWHhxhJsVgTzjHLlYc+1PxucdihQCKI6lIlQl5 aCEKlRhK9qOrXmU6CbochpfGe3K3vs2KxVvbpP200IDZyWpL/CwRS8F/AWaqB1XsVov5 iSTF7F2wmk7ASgnrXs6vTQdWGXMaje6C5uYatui1yc5Wj+1mbgkkoi8JxUwTouUCsMQt 9IVlp1Eny3AAP9YMh9VmOuwpaVQmgUiBBa7RZ/dbrRAJjkqGZfZdsAEhHk1uEiMM882v vSZAFhYbIVLHDVQoofvBGWu7qd3pUk4g28X1Iq+6rMvlvw7CB4x8LAkAl3Zvf239AlIp 7wSg== X-Gm-Message-State: AOAM533HAKXZW8GOOj7g1EOy1WEDZEmfugrd/+TEfKfFIuNrosiYDRj3 2Bx//BJUYBHxG+leiY2tINYg8OcDKI8= X-Google-Smtp-Source: ABdhPJxoCxaI3gx7lg/W2U2MjWFRDW2VuV2rXQWp9N+0vtRxavVsQlxn7ENigUX4bwTMSJO9wqgeNw== X-Received: by 2002:adf:f48d:: with SMTP id l13mr8504513wro.43.1599077799960; Wed, 02 Sep 2020 13:16:39 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v3sm1065793wmh.6.2020.09.02.13.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 13:16:39 -0700 (PDT) Message-Id: From: "Orgad Shaneh via GitGitGadget" Date: Wed, 02 Sep 2020 20:16:38 +0000 Subject: [PATCH] vcbuild: fix library name for expat with make MSVC=1 Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Orgad Shaneh , Orgad Shaneh Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Orgad Shaneh Signed-off-by: Orgad Shaneh --- vcbuild: fix library name for expat with make MSVC=1 Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com] Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-722%2Forgads%2Fvcbuild-expat-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-722/orgads/vcbuild-expat-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/722 compat/vcbuild/scripts/clink.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: e19713638985533ce461db072b49112da5bd2042 diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl index 61ad084a7b..df167d1e1a 100755 --- a/compat/vcbuild/scripts/clink.pl +++ b/compat/vcbuild/scripts/clink.pl @@ -66,7 +66,7 @@ } push(@args, $lib); } elsif ("$arg" eq "-lexpat") { - push(@args, "expat.lib"); + push(@args, "libexpat.lib"); } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { $arg =~ s/^-L/-LIBPATH:/; push(@lflags, $arg);