From 11be8734cb342b2219ba2ccc81a4455688ff57a3 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 11 Nov 2014 00:05:52 -0800
Subject: [PATCH] GNUmakefile: Remove LIBPATH from the build system since
 nothing needs it. Fixes #1192.

---
 GNUmakefile            | 7 +++----
 vm/Config.linux.x86.64 | 1 -
 vm/Config.macosx       | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index a04b310bb5..b94c833e84 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,7 +3,6 @@ ifdef CONFIG
 	GIT_LABEL = $(shell git describe --all --long)
 
 	BUNDLE = Factor.app
-	LIBPATH = -L/usr/X11R6/lib
 
 	include $(CONFIG)
 
@@ -211,17 +210,17 @@ $(ENGINE): $(DLL_OBJS)
 factor-lib: $(ENGINE)
 
 factor: $(EXE_OBJS) $(DLL_OBJS)
-	$(TOOLCHAIN_PREFIX)$(CXX) $(LIBPATH) -L. $(DLL_OBJS) \
+	$(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \
 		$(CFLAGS) -o $(EXECUTABLE) $(LIBS) $(EXE_OBJS)
 
 factor-console: $(EXE_OBJS) $(DLL_OBJS)
-	$(TOOLCHAIN_PREFIX)$(CXX) $(LIBPATH) -L. $(DLL_OBJS) \
+	$(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \
 		$(CFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(LIBS) $(EXE_OBJS)
 
 factor-ffi-test: $(FFI_TEST_LIBRARY)
 
 $(FFI_TEST_LIBRARY): vm/ffi_test.o
-	$(TOOLCHAIN_PREFIX)$(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o $(FFI_TEST_LIBRARY) $(TEST_OBJS)
+	$(TOOLCHAIN_PREFIX)$(CC) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o $(FFI_TEST_LIBRARY) $(TEST_OBJS)
 
 vm/resources.o:
 	$(TOOLCHAIN_PREFIX)$(WINDRES) vm/factor.rs vm/resources.o
diff --git a/vm/Config.linux.x86.64 b/vm/Config.linux.x86.64
index bfd1222496..43af4d80ca 100644
--- a/vm/Config.linux.x86.64
+++ b/vm/Config.linux.x86.64
@@ -1,3 +1,2 @@
 include vm/Config.linux
 include vm/Config.x86.64
-LIBPATH = -L/usr/X11R6/lib64 -L/usr/X11R6/lib
diff --git a/vm/Config.macosx b/vm/Config.macosx
index a7f3785353..86a71c1475 100644
--- a/vm/Config.macosx
+++ b/vm/Config.macosx
@@ -20,7 +20,7 @@ LINKER = $(CXX) $(CFLAGS) -dynamiclib -single_module \
 	-current_version $(VERSION) \
 	-compatibility_version $(VERSION) \
 	-fvisibility=hidden \
-	$(LIBS) $(LIBPATH) -o
+	$(LIBS) -o
 
 LINK_WITH_ENGINE = -lfactor
 
-- 
2.34.1