diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2023-08-17 17:27:47 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2023-08-17 17:34:11 -0700 |
| commit | f5ae600cc702553d8bc2f72828229a10e96cdba1 (patch) | |
| tree | 4a335b954d534825fafbe02fe74fdb6b5f0cdfe8 | |
| parent | daf27aed082a505e787236c308f3c7fff9926592 (diff) | |
| download | zlib-f5ae600cc702553d8bc2f72828229a10e96cdba1.tar.gz zlib-f5ae600cc702553d8bc2f72828229a10e96cdba1.tar.bz2 zlib-f5ae600cc702553d8bc2f72828229a10e96cdba1.zip | |
Revert flipping of load flags in Makefile.in for z/OS.
It looked innocuous enough and worked on macOS, but failed on
Ubuntu.
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index f5c2263..e5adb5b 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -282,22 +282,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a | |||
| 282 | -@rmdir objs | 282 | -@rmdir objs |
| 283 | 283 | ||
| 284 | example$(EXE): example.o $(STATICLIB) | 284 | example$(EXE): example.o $(STATICLIB) |
| 285 | $(CC) $(CFLAGS) -o $@ $(TEST_LDFLAGS) example.o | 285 | $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) |
| 286 | 286 | ||
| 287 | minigzip$(EXE): minigzip.o $(STATICLIB) | 287 | minigzip$(EXE): minigzip.o $(STATICLIB) |
| 288 | $(CC) $(CFLAGS) -o $@ $(TEST_LDFLAGS) minigzip.o | 288 | $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) |
| 289 | 289 | ||
| 290 | examplesh$(EXE): example.o $(SHAREDLIBV) | 290 | examplesh$(EXE): example.o $(SHAREDLIBV) |
| 291 | $(CC) $(CFLAGS) -o $@ $(LDFLAGS) example.o -L. $(SHAREDLIBV) | 291 | $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV) |
| 292 | 292 | ||
| 293 | minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) | 293 | minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) |
| 294 | $(CC) $(CFLAGS) -o $@ $(LDFLAGS) minigzip.o -L. $(SHAREDLIBV) | 294 | $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV) |
| 295 | 295 | ||
| 296 | example64$(EXE): example64.o $(STATICLIB) | 296 | example64$(EXE): example64.o $(STATICLIB) |
| 297 | $(CC) $(CFLAGS) -o $@ $(TEST_LDFLAGS) example64.o | 297 | $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) |
| 298 | 298 | ||
| 299 | minigzip64$(EXE): minigzip64.o $(STATICLIB) | 299 | minigzip64$(EXE): minigzip64.o $(STATICLIB) |
| 300 | $(CC) $(CFLAGS) -o $@ $(TEST_LDFLAGS) minigzip64.o | 300 | $(CC) $(CFLAGS) -o $@) minigzip64.o $(TEST_LDFLAGS |
| 301 | 301 | ||
| 302 | install-libs: $(LIBS) | 302 | install-libs: $(LIBS) |
| 303 | -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi | 303 | -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi |