src/utils/hsdis/Makefile

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
 #
 # Subject to the condition set forth below, permission is hereby granted to

@@ -124,11 +124,11 @@
 ARCH            = ppc64
 CC              = xlc_r
 CFLAGS          += -DAIX -g -qpic=large -q64
 CFLAGS/ppc64    += -q64
 AR              = ar -X64
-DLDFLAGS        += -qmkshrobj -lz
+DLDFLAGS        += -qmkshrobj
 OUTFLAGS        += -o $@
 LIB_EXT         = .so
 else
 ## OS = Darwin ##
 ifeq ($(OS),Darwin)

@@ -149,11 +149,10 @@
 LIB_EXT         = .dylib
 CC              = gcc
 CFLAGS          += -O
 # CFLAGS        += -DZ_PREFIX
 DLDFLAGS        += -shared
-DLDFLAGS        += -lz
 LDFLAGS         += -ldl
 OUTFLAGS        += -o $@
 else
 ## OS = Windows ##
 OS              = windows

@@ -197,11 +196,12 @@
 
 SOURCE          = hsdis.c
 
 LIBRARIES =     $(TARGET_DIR)/bfd/libbfd.a \
                 $(TARGET_DIR)/opcodes/libopcodes.a \
-                $(TARGET_DIR)/libiberty/libiberty.a
+                $(TARGET_DIR)/libiberty/libiberty.a \
+                $(TARGET_DIR)/zlib/libz.a
 
 DEMO_TARGET     = $(TARGET_DIR)/hsdis-demo
 DEMO_SOURCE     = hsdis-demo.c
 
 .PHONY:  all clean demo both