[PATCH 2/2] add liconv link for makefile
From: Colin Curtis <colinpcurtis@gmail.com>
---
Makefile | 8 ++++++--
builtin/gud.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 379cd91a97..e1679cca47 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# The default target of this Makefile is...
all::
-
+OS := $(shell uname)
# Define V=1 to have a more verbose compile.
#
# Define SHELL_PATH to a POSIX shell if your /bin/sh is broken.
@@ -1514,7 +1514,11 @@ ifndef NO_ICONV
ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
ICONV_LINK += -lintl
endif
- EXTLIBS += $(ICONV_LINK) /usr/local/Cellar/libiconv/1.16/lib/libiconv.dylib # -liconv
+ ifeq ($(OS),Darwin)
+ EXTLIBS += $(ICONV_LINK) /usr/local/Cellar/libiconv/1.16/lib/libiconv.dylib
+ else
+ EXTLIBS += $(ICONV_LINK) -liconv
+ endif
endif
endif
ifdef ICONV_OMITS_BOM
diff --git a/builtin/gud.c b/builtin/gud.c
index 04808a08f5..9a5a1e71ac 100644
--- a/builtin/gud.c
+++ b/builtin/gud.c
@@ -24,4 +24,4 @@ int cmd_gud(int argc, const char **argv, const char *prefix)
}
return 0;
-}
\ No newline at end of file
+}
--
2.30.1 (Apple Git-130)