From a32f73509fc001a62abd1e8d888ef0e3c9ec2f09 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 26 May 2021 10:23:02 +0200 Subject: [PATCH] Revert "Temporarily force clang if available" This reverts commit c2bfe0202f5c58e35700925f6bbf5bafe613d509. --- Makefile | 11 ----------- c/ladspa/Makefile | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile b/Makefile index a7e70d5..1801e1e 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,6 @@ 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 @@ -30,14 +27,6 @@ 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 025e2d1..ee7b64d 100644 --- a/c/ladspa/Makefile +++ b/c/ladspa/Makefile @@ -1,3 +1,3 @@ default: - $(CC) -Wall -O2 -c -fPIC ../ringbuf.c ../rnnoise/*.c module.c + $(CC) -Wall -Werror -O2 -c -fPIC ../ringbuf.c ../rnnoise/*.c module.c $(CC) -shared -lm -Wl,--version-script=export.txt -o rnnoise_ladspa.so *.o