iconv seems to be part of ubuntu's standard C library, no -liconv exists

bbbradsmith · Feb 4, 2025 · 0716f38 · 0716f38
1 parent 49d70f1
commit 0716f38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
@@ -31,10 +31,6 @@ jobs:
     steps:
       - name: Checkout Files
         uses: actions/checkout@v4
-      - name: Setup libiconv
-        uses: ConorMacBride/install-package@v1
-        with:
-          apt: libc6-dev
       - name: Build
         run: make -C contrib -j
 

diff --git a/contrib/Makefile b/contrib/Makefile
@@ -36,7 +36,14 @@ ifeq ($(CXXFLAGS),)
 CXXFLAGS := $(CXXFLAGS_DEBUG)
 endif
 
-LDFLAGS_EXTRA := -liconv
+ifeq ($(OS),Windows_NT)
+	LDFLAGS_EXTRA := -liconv
+else ifeq ($(shell uname),Darwin)
+	LDFLAGS_EXTRA := -liconv
+else
+	# iconv assumed to be part of the standard C library
+	LDFLAGS_EXTRA :=
+endif
 
 LIBXGM_CPP_SRCS = \
 	../xgm/devices/Audio/MedianFilter.cpp \