--- src/Makefile.orig	2017-05-12 11:01:20 UTC
+++ src/Makefile
@@ -48,7 +48,7 @@ endif
 # we need UCL and zlib - you can set envvar UPX_UCLDIR
 ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
 INCLUDES += -I$(UPX_UCLDIR)/include
-LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
+LIBS += -L$(UPX_UCLDIR)/lib
 endif
 LIBS += -lucl -lz
 # LZMA from https://github.com/upx/upx-lzma-sdk
@@ -62,9 +62,9 @@ CXXFLAGS_OPTIMIZE ?= -O2
 endif
 CXXFLAGS += $(CXXFLAGS_OPTIMIZE)
 # protect against security threats caused by misguided C++ compiler "optimizations"
-ifeq ($(findstring clang,$(CXX)),)
-CXXFLAGS += -fno-delete-null-pointer-checks
-endif
+# ifeq ($(findstring clang,$(CXX)),)
+# CXXFLAGS += -fno-delete-null-pointer-checks
+# endif
 CXXFLAGS += -fno-strict-aliasing -fwrapv
 CXXFLAGS += -funsigned-char
 CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings