]> git.lttng.org Git - lttng-ust.git/commitdiff
Revert "Fix (another) linker library order"
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 14 May 2013 12:35:28 +0000 (14:35 +0200)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 14 May 2013 12:35:28 +0000 (14:35 +0200)
This reverts commit a51ac6d9a011ba10b0be396dc1e801b2fc829651.

Hrm, actually, these patches are wrong.

commit 725e63c5194bfdcde0a2a3507aca156ba36cf49f for instance:

"Libraries must be specified after the binary target."

 demo: demo.o
-       $(CC) -o $@ $(LIBS) $^
+       $(CC) -o $@ $^ $(LIBS)

the binary target here is "$@".

$^ is the source file name (demo.c).

this patch moves the source file name prior to the libraries, which is
incorrect (ref: gcc(1)). The input files should appear last.

So it breaks builds where $(LIBS) is non-empty.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
doc/examples/hello-static-lib/Makefile

index dd246f70a5c274dd465f18cf025e57b5bc678e17..a5bf2df1a6b32fdb5ff5e62f7ce52a5a002b79a5 100644 (file)
@@ -46,7 +46,7 @@ hello.o: hello.c
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 hello: hello.o lttng-ust-provider-hello.a
-       $(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
+       $(CC) -o $@ $(LDFLAGS) $(LIBS) $^
 
 .PHONY: clean
 clean:
This page took 0.032201 seconds and 4 git commands to generate.