| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | Obey LDFLAGS for tests |
| 2 | |
| 3 | Upstream-Status: Submitted [https://github.com/madler/zlib/pull/409] |
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 5 | |
| 6 | --- zlib-1.2.8.orig/Makefile.in |
| 7 | +++ zlib-1.2.8/Makefile.in |
| 8 | @@ -26,7 +26,7 @@ CFLAGS=-O |
| 9 | |
| 10 | SFLAGS=-O |
| 11 | LDFLAGS= |
| 12 | -TEST_LDFLAGS=-L. libz.a |
| 13 | +TEST_LDFLAGS=-L. $(LDFLAGS) |
| 14 | LDSHARED=$(CC) |
| 15 | CPP=$(CC) -E |
| 16 | |
| 17 | @@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz. |
| 18 | -@rmdir objs |
| 19 | |
| 20 | example$(EXE): example.o $(STATICLIB) |
| 21 | - $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) |
| 22 | + $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB) |
| 23 | |
| 24 | minigzip$(EXE): minigzip.o $(STATICLIB) |
| 25 | - $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) |
| 26 | + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB) |
| 27 | |
| 28 | examplesh$(EXE): example.o $(SHAREDLIBV) |
| 29 | - $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) |
| 30 | + $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV) |
| 31 | |
| 32 | minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) |
| 33 | - $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) |
| 34 | + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV) |
| 35 | |
| 36 | example64$(EXE): example64.o $(STATICLIB) |
| 37 | - $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) |
| 38 | + $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB) |
| 39 | |
| 40 | minigzip64$(EXE): minigzip64.o $(STATICLIB) |
| 41 | - $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) |
| 42 | + $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB) |
| 43 | |
| 44 | install-libs: $(LIBS) |
| 45 | -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi |