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

@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
dscho added a commit that referenced this pull request Oct 8, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
aae2111 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 8, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
d303ed4 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 9, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
fae3b7c 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 9, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6d53b35 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 9, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
1ef6652 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 9, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
db966a8 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 9, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
cecb748 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 9, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
3873408 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 10, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6a1de33 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 10, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
19ad180 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 10, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
98f6d49 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 11, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
356381e 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 11, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
e664a3b 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 11, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
38f0a13 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 11, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
2889f9d 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 20, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
d75378b 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 20, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
9bf67cd 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 21, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
86fb52e 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 21, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
6911973 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 21, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ae9d2c0 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 22, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
ed221a8 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 22, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
4ad52fe 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 22, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
d03fdb6 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 22, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
426f2a1 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 22, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
9a17ac6 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 22, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
5a317ff 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
dscho added a commit that referenced this pull request Oct 23, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
f0c2245 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 25, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
e04f276 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 25, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
cf69371 
clink.pl: fix MSVC compile script to handle libcurl-d.lib
git-for-windows-ci pushed a commit that referenced this pull request Oct 25, 2024
@dscho
Merge pull request #2501 from jeffhostetler/clink-debug-curl
c91610d 
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