| Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 1 | From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 5 Apr 2017 17:36:45 +0000 |
| 4 | Subject: [PATCH] Add $(LDFLAGS) to linker cmdline |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | --- |
| 8 | Makefile | 4 ++-- |
| 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | Index: git/Makefile |
| 12 | =================================================================== |
| 13 | --- git.orig/Makefile |
| 14 | +++ git/Makefile |
| 15 | @@ -14,7 +14,7 @@ ZLIB_O := crc32.o deflate.o adler32.o co |
| 16 | CC := gcc |
| 17 | CHECK := cgcc |
| 18 | CHECKFLAGS := -D__CHECK_ENDIAN__ |
| 19 | -CFLAGS := -std=gnu99 |
| 20 | +CFLAGS += -std=gnu99 |
| 21 | CFLAGS += -Wall |
| 22 | CFLAGS += -Os |
| 23 | CFLAGS += -D_FILE_OFFSET_BITS=64 |
| 24 | @@ -28,18 +28,18 @@ $(ZLIB_O): /usr/lib/libz.a |
| 25 | |
| 26 | ifdef S |
| 27 | EXTRA_OBJ := $(ZLIB_O) |
| 28 | -CFLAGS += -static |
| 29 | +LDFLAGS += -static |
| 30 | else |
| 31 | -CFLAGS += -lz |
| 32 | +LDFLAGS += -lz |
| 33 | endif |
| 34 | |
| 35 | mklogfs: $(EXTRA_OBJ) |
| 36 | mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o |
| 37 | - $(CC) $(CFLAGS) -o $@ $^ |
| 38 | + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) |
| 39 | |
| 40 | logfsck: $(ZLIB_O) |
| 41 | logfsck: fsck.o lib.o journal.o super.o |
| 42 | - $(CC) $(CFLAGS) -o $@ $^ |
| 43 | + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) |
| 44 | |
| 45 | $(OBJ): kerncompat.h logfs.h logfs_abi.h btree.h |
| 46 | |