mirror of
https://github.com/thead-yocto-mirror/meta-external-toolchain
synced 2026-08-06 20:14:39 +02:00
3b44877887
Internal toolchains generally don't see these, as they build that toolchain with the default behavior they expect, so it's appropriate to include these fixes with the external toolchain configuration, for now. Signed-off-by: Christopher Larson <chris_larson@mentor.com>
79 lines
2.2 KiB
Diff
79 lines
2.2 KiB
Diff
---
|
|
Makefile | 11 ++++++-----
|
|
btreplay/Makefile | 3 ++-
|
|
btt/Makefile | 3 ++-
|
|
3 files changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
--- git.orig/Makefile
|
|
+++ git/Makefile
|
|
@@ -1,5 +1,6 @@
|
|
CC = gcc
|
|
CFLAGS = -Wall -O2 -g -W
|
|
+LDFLAGS =
|
|
ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
|
|
LIBS = -lpthread
|
|
@@ -23,19 +24,19 @@ btreplay/btreplay:
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
|
|
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
|
|
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
|
|
|
|
blktrace: blktrace.o act_mask.o
|
|
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
|
|
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
|
|
|
|
verify_blkparse: verify_blkparse.o
|
|
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
|
|
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
|
|
|
|
blkrawverify: blkrawverify.o
|
|
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
|
|
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
|
|
|
|
blkiomon: blkiomon.o rbtree.o
|
|
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
|
|
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS)
|
|
|
|
$(PROGS): | depend
|
|
|
|
--- git.orig/btreplay/Makefile
|
|
+++ git/btreplay/Makefile
|
|
@@ -7,6 +7,7 @@
|
|
|
|
CC = gcc
|
|
CFLAGS = -Wall -W -O2 -g
|
|
+LDFLAGS =
|
|
INCS = -I. -I.. -I../btt
|
|
OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
|
|
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
@@ -35,7 +36,7 @@ btrecord: btrecord.o
|
|
$(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
|
|
|
|
btreplay: btreplay.o
|
|
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
|
|
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
|
|
|
|
depend:
|
|
@$(CC) -MM $(CFLAGS) *.c 1> .depend
|
|
--- git.orig/btt/Makefile
|
|
+++ git/btt/Makefile
|
|
@@ -7,6 +7,7 @@
|
|
|
|
CC = gcc
|
|
CFLAGS = -Wall -W -O2 -g
|
|
+LDFLAGS =
|
|
INCS = -I. -I..
|
|
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
override CFLAGS += $(INCS) $(XCFLAGS)
|
|
@@ -38,7 +39,7 @@ clean: docsclean
|
|
$(CC) $(CFLAGS) -c -o $*.o $<
|
|
|
|
btt: $(OBJS)
|
|
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
|
|
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
|
|
|
|
ifneq ($(wildcard .depend),)
|
|
include .depend
|