Skip to content

Conversation

@aloisklink
Copy link
Contributor

While I was making PR #11446 and trying to build all of the unit tests in CMake, I noticed that some of the unit tests seem to have unneeded _LDADD overrides in the tests/unit/Makefile.inc file.

For reference, the default LDADD for all unit tests is:

LDADD = $(top_builddir)/src/libcurltool.la \
$(top_builddir)/lib/libcurlu.la \
@LDFLAGS@ @LIBCURL_LIBS@ @NSS_LIBS@

Changes

Removing unit1394_LDADD

These custom unit1394_LDADD and similar automake overrides are no longer neded. They were originally added by added by 8dac7be for metalink support, but are no longer after 265b14d removed metalink.

Removing unit1621_LDADD

The unit1621_LDADD variable has the exact same value as the LDADD flag in Makefile.am, except without @LDFLAGS@ @LIBCURL_LIBS@.

This was originally added by 98e6629, but I can't see any reason why it exists, so we should remove it to clean things up.

These custom `unit1394_LDADD` and similar automake overrides are no
longer neded. They were originally added by added by [8dac7be][] for
metalink support, but are no longer after [265b14d][] removed metalink.

[8dac7be]: curl@8dac7be
[265b14d]: curl@265b14d
The `unit1621_LDADD` variable has the exact same value as the `LDADD`
flag in `Makefile.am`, except without `@LDFLAGS@ @LIBCURL_LIBS@`.

This was originally added by [98e6629][], but I can't see any reason
why it exists, so we should remove it to clean things up.

[98e6629]: curl@98e6629
@bagder
Copy link
Member

bagder commented Jul 21, 2023

Thanks!

@bagder bagder closed this in 50c819e Jul 21, 2023
bagder pushed a commit that referenced this pull request Jul 21, 2023
The `unit1621_LDADD` variable has the exact same value as the `LDADD`
flag in `Makefile.am`, except without `@LDFLAGS@ @LIBCURL_LIBS@`.

This was originally added by [98e6629][], but I can't see any reason
why it exists, so we should remove it to clean things up.

[98e6629]: 98e6629

Closes #11494
@aloisklink aloisklink deleted the simplify-unittest-link-flags/ci branch July 22, 2023 01:07
ptitSeb pushed a commit to wasix-org/curl that referenced this pull request Sep 25, 2023
These custom `unit1394_LDADD` and similar automake overrides are no
longer neded. They were originally added by added by [8dac7be][] for
metalink support, but are no longer after [265b14d][] removed metalink.

[8dac7be]: curl@8dac7be
[265b14d]: curl@265b14d

Closes curl#11494
ptitSeb pushed a commit to wasix-org/curl that referenced this pull request Sep 25, 2023
The `unit1621_LDADD` variable has the exact same value as the `LDADD`
flag in `Makefile.am`, except without `@LDFLAGS@ @LIBCURL_LIBS@`.

This was originally added by [98e6629][], but I can't see any reason
why it exists, so we should remove it to clean things up.

[98e6629]: curl@98e6629

Closes curl#11494
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants