Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clink.pl: fix MSVC compile script to handle libcurl-d.lib #2501

Merged
merged 1 commit into from
Jan 30, 2020
Merged

clink.pl: fix MSVC compile script to handle libcurl-d.lib #2501

merged 1 commit into from
Jan 30, 2020

Conversation

jeffhostetler
Copy link

@jeffhostetler jeffhostetler commented Jan 30, 2020 •
edited by dscho
Loading

I don't remember having to do this in the past, so maybe something
changed with the libcurl distribution to cause the problem. And ideally
I could send this upstream first rather than adding more ballast for GFW.

Update clink.pl to link with either libcurl.lib or libcurl-d.lib
depending on whether DEBUG=1 is set.

Signed-off-by: Jeff Hostetler jeffhost@microsoft.com

@jeffhostetler jeffhostetler requested a review from dscho January 30, 2020 19:32
@dscho
Copy link
Member

dscho commented Jan 30, 2020

Darn, darn! I totally forgot that in #2476, did I not?

@jeffhostetler @dscho
clink.pl: fix MSVC compile script to handle libcurl-d.lib
5aaa898 
Update clink.pl to link with either libcurl.lib or libcurl-d.lib
depending on whether DEBUG=1 is set.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho changed the title WIP clink.pl: fix MSVC compile script to handle libcurl-d.lib clink.pl: fix MSVC compile script to handle libcurl-d.lib Jan 30, 2020
@dscho
Copy link
Member

dscho commented Jan 30, 2020

ideally I could send this upstream first rather than adding more ballast for GFW.

I don't think that it is a ton of ballast, and I don't see any value in sending this through the pu -> next -> master trickle-down development before benefiting from the change ;-) So I'll merge it.

@dscho dscho merged commit 5f4dea1 into git-for-windows:master Jan 30, 2020
git-for-windows-ci pushed a commit that referenced this pull request Jan 31, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
4c91fe9 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 31, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
a81aa54 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 31, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
0005de4 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 31, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
7f5a7ef 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
4a2ed27 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ab223ca 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
370551c 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
413086e 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
@weekly-digest weekly-digest bot mentioned this pull request Feb 2, 2020
Closed
git-for-windows-ci pushed a commit that referenced this pull request Feb 5, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
93174e9 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Feb 5, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
2d939fa 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Feb 5, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ce5811c 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Feb 6, 2020
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
8b3f6bd 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Dec 19, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
0a893d2 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit to dscho/git that referenced this pull request Dec 30, 2024
@dscho
Merge pull request git-for-windows#2501 from jeffhostetler/clink-debu…
e6281a2 
…g-curl

clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit to dscho/git that referenced this pull request Dec 30, 2024
@dscho
Merge pull request git-for-windows#2501 from jeffhostetler/clink-debu…
870c8d6 
…g-curl

clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Dec 31, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
f577bc8 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Dec 31, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
db25636 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
9671545 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
5710184 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
397f49d 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6b927fb 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 1, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
eda60b2 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6e6d958 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
b47bd54 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 2, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ea53d51 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 3, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
da2ea04 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 6, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
789cebb 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 6, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
1694d17 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
2c33ec6 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
660e47f 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
@dscho dscho mentioned this pull request Jan 7, 2025
Merged
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
@dscho
Merge pull request git-for-windows#2501 from jeffhostetler/clink-debu…
2821c40 
…g-curl

clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
@dscho
Merge pull request git-for-windows#2501 from jeffhostetler/clink-debu…
cd22a8a 
…g-curl

clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
f0869b9 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6e7eab0 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ff10fdb 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6018cbc 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
c886868 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ecf1edb 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
b298d15 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
eb52332 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Jan 17, 2025
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
1e64ce5 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dscho dscho dscho left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jeffhostetler @dscho