mailing list of musl libc
 help / color / Atom feed
* [musl] [PATCH] Makefile: fix src/api compilation.
@ 2020-07-23  3:44 Érico Rolim
  2020-07-24 14:33 ` Szabolcs Nagy
  0 siblings, 1 reply; 3+ messages in thread
From: Érico Rolim @ 2020-07-23  3:44 UTC (permalink / raw)
  To: musl; +Cc: Érico Rolim

Adding all .o files in src/api to the api/main.OBJ variable led to them
being included twice when linking api/main.exe, which failed with a
double definition of the main() function. This can be tested by removing
the failing definitions from unistdc.c and running make.
---

This is a patch for libc-test.

 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 86b6ff5..683c850 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,6 @@ $(B)/common/mtest.o: src/common/mtest.h
 $(math.OBJS): src/common/mtest.h
 
 $(B)/api/main.exe: $(api.OBJS)
-api/main.OBJS:=$(api.OBJS)
 $(api.OBJS):$(B)/common/options.h
 $(api.OBJS):CFLAGS+=-pedantic-errors -Werror -Wno-unused -D_XOPEN_SOURCE=700
 
-- 
2.27.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [musl] [PATCH] Makefile: fix src/api compilation.
  2020-07-23  3:44 [musl] [PATCH] Makefile: fix src/api compilation Érico Rolim
@ 2020-07-24 14:33 ` Szabolcs Nagy
  2020-07-24 18:23   ` Érico Nogueira
  0 siblings, 1 reply; 3+ messages in thread
From: Szabolcs Nagy @ 2020-07-24 14:33 UTC (permalink / raw)
  To: Érico Rolim; +Cc: musl

* Érico Rolim <ericonr@disroot.org> [2020-07-23 00:44:33 -0300]:
> Adding all .o files in src/api to the api/main.OBJ variable led to them
> being included twice when linking api/main.exe, which failed with a
> double definition of the main() function. This can be tested by removing
> the failing definitions from unistdc.c and running make.

thanks.

> ---
> 
> This is a patch for libc-test.
> 
>  Makefile | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 86b6ff5..683c850 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -113,7 +113,6 @@ $(B)/common/mtest.o: src/common/mtest.h
>  $(math.OBJS): src/common/mtest.h
>  
>  $(B)/api/main.exe: $(api.OBJS)
> -api/main.OBJS:=$(api.OBJS)
>  $(api.OBJS):$(B)/common/options.h
>  $(api.OBJS):CFLAGS+=-pedantic-errors -Werror -Wno-unused -D_XOPEN_SOURCE=700

this is not the right fix,

the problem is that api/main.o is duplicated:
once because of the %.exe: %.o rule and once
in the api/main.OBJS.

but all other api/*.o files are not duplicated
and should be linked (so we link test all
referenced symbols not just include header test).

i'm considering doing

 $(B)/%.exe: $(B)/%.o
-       $(CC) $(LDFLAGS) $($*.LDFLAGS) -o $@ $< $($*.OBJS) $(LDLIBS) $($*.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@; cat $@.ld.err
+       $(CC) $(LDFLAGS) $($*.LDFLAGS) -o $@ $(sort $< $($*.OBJS)) $(LDLIBS) $($*.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@; cat $@.ld.err

(note: the make sort function removes duplicates)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [musl] [PATCH] Makefile: fix src/api compilation.
  2020-07-24 14:33 ` Szabolcs Nagy
@ 2020-07-24 18:23   ` Érico Nogueira
  0 siblings, 0 replies; 3+ messages in thread
From: Érico Nogueira @ 2020-07-24 18:23 UTC (permalink / raw)
  To: Szabolcs Nagy; +Cc: musl

On Fri Jul 24, 2020 at 1:33 PM -03, Szabolcs Nagy wrote:
> * Érico Rolim <ericonr@disroot.org> [2020-07-23 00:44:33 -0300]:
> > Adding all .o files in src/api to the api/main.OBJ variable led to them
> > being included twice when linking api/main.exe, which failed with a
> > double definition of the main() function. This can be tested by removing
> > the failing definitions from unistdc.c and running make.
>
> thanks.
>
> > ---
> > 
> > This is a patch for libc-test.
> > 
> >  Makefile | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index 86b6ff5..683c850 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -113,7 +113,6 @@ $(B)/common/mtest.o: src/common/mtest.h
> >  $(math.OBJS): src/common/mtest.h
> >  
> >  $(B)/api/main.exe: $(api.OBJS)
> > -api/main.OBJS:=$(api.OBJS)
> >  $(api.OBJS):$(B)/common/options.h
> >  $(api.OBJS):CFLAGS+=-pedantic-errors -Werror -Wno-unused -D_XOPEN_SOURCE=700
>
> this is not the right fix,
>
> the problem is that api/main.o is duplicated:
> once because of the %.exe: %.o rule and once
> in the api/main.OBJS.
>
> but all other api/*.o files are not duplicated
> and should be linked (so we link test all
> referenced symbols not just include header test).
>
> i'm considering doing
>
> $(B)/%.exe: $(B)/%.o
> - $(CC) $(LDFLAGS) $($*.LDFLAGS) -o $@ $< $($*.OBJS) $(LDLIBS)
> $($*.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@; cat $@.ld.err
> + $(CC) $(LDFLAGS) $($*.LDFLAGS) -o $@ $(sort $< $($*.OBJS)) $(LDLIBS)
> $($*.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@; cat $@.ld.err
>
> (note: the make sort function removes duplicates)

Didn't know about that! This worked here as a fix, thanks.


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-23  3:44 [musl] [PATCH] Makefile: fix src/api compilation Érico Rolim
2020-07-24 14:33 ` Szabolcs Nagy
2020-07-24 18:23   ` Érico Nogueira

mailing list of musl libc

Archives are clonable: git clone --mirror http://inbox.vuxu.org/musl

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.musl


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git