GNUmakefile: Remove LIBPATH from the build system since nothing needs it. Fixes ...

diff --git a/GNUmakefile b/GNUmakefile
index a04b310bb5c2077f50211c1491823e003dc95ad4..b94c833e84d293f3dbdb028a76f9fcff1a627bd2 100644 (file)
--- 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 bfd12224965ee9697827556cc0a4f6b6a63cb930..43af4d80ca97feeb8bc385097a76cd111a089c08 100644 (file)
--- 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 a7f3785353ca5cb11bbbeeccd5b788e27410fa35..86a71c147568bc9b18964c28bbc77b6ed1958be1 100644 (file)
--- 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