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.
This commit is contained in:
Mark Pizzolato 2016-10-12 05:51:36 -07:00
parent 5a6e7ce172
commit 2c1cc11485

View file

@ -331,7 +331,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
ifeq (X11R7,$(shell if $(TEST) -d /usr/X11R7/lib; then echo X11R7; fi)) ifeq (X11R7,$(shell if $(TEST) -d /usr/X11R7/lib; then echo X11R7; fi))
LIBPATH += /usr/X11R7/lib LIBPATH += /usr/X11R7/lib
INCPATH += /usr/X11R7/include 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 OS_CCDEFS += -I/usr/X11R7/include
endif endif
ifeq (/usr/local/lib,$(findstring /usr/local/lib,$(LIBPATH))) ifeq (/usr/local/lib,$(findstring /usr/local/lib,$(LIBPATH)))