From 2c1cc114859521f645e9ce2b5ba53b9494da42de Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 12 Oct 2016 05:51:36 -0700 Subject: [PATCH] makefile: Fix to allow compiling with clang on NetBSD clang doesn't like the -R option, it wants the long form -Wl,-R. gcc is ok with either. clang on OS X doesn't like that form, but the change is only in a conditional which is relevant when X11R7 is installed and that isn't the case for OS X. --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 8f6d1038..15807342 100644 --- a/makefile +++ b/makefile @@ -331,7 +331,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) ifeq (X11R7,$(shell if $(TEST) -d /usr/X11R7/lib; then echo X11R7; fi)) LIBPATH += /usr/X11R7/lib INCPATH += /usr/X11R7/include - OS_LDFLAGS += -L/usr/X11R7/lib -R/usr/X11R7/lib + OS_LDFLAGS += -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib OS_CCDEFS += -I/usr/X11R7/include endif ifeq (/usr/local/lib,$(findstring /usr/local/lib,$(LIBPATH)))