summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlawl <github@dumbinter.net>2021-05-20 15:04:40 +0200
committerlawl <github@dumbinter.net>2021-05-20 15:04:40 +0200
commitc2bfe0202f5c58e35700925f6bbf5bafe613d509 (patch)
tree8e332e00b5078885af3039bf14e02259acd92051
parenta57cc201100aa58ca06704afb10d416cb87750e3 (diff)
Temporarily force clang if available0.11.2
GCC10 seems to refuse to link libm. GCC11 and clang seem to work fine.
-rw-r--r--Makefile11
-rw-r--r--c/ladspa/Makefile2
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1801e1e..a7e70d5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ UPDATE_URL=https://noisetorch.epicgamer.org
UPDATE_PUBKEY=3mL+rBi4yBZ1wGimQ/oSQCjxELzgTh+673H4JdzQBOk=
VERSION := $(shell git describe --tags)
+
+CLANG := $(shell which clang)
+
dev: rnnoise
mkdir -p bin/
go generate
@@ -27,6 +30,14 @@ release: rnnoise
go run scripts/signer.go -s
git describe --tags > bin/version.txt
rnnoise:
+ # For some reason gcc10 refuses to link libm
+ # gcc11 seems to work. Temporarily force clang
+ # if available until i can fix this properly
+ifdef CLANG
+ cd c/ladspa; \
+ CC=clang make
+else
cd c/ladspa; \
make
+endif
diff --git a/c/ladspa/Makefile b/c/ladspa/Makefile
index ee7b64d..025e2d1 100644
--- a/c/ladspa/Makefile
+++ b/c/ladspa/Makefile
@@ -1,3 +1,3 @@
default:
- $(CC) -Wall -Werror -O2 -c -fPIC ../ringbuf.c ../rnnoise/*.c module.c
+ $(CC) -Wall -O2 -c -fPIC ../ringbuf.c ../rnnoise/*.c module.c
$(CC) -shared -lm -Wl,--version-script=export.txt -o rnnoise_ladspa.so *.o