Use clang when possible

brummer10 · Apr 25, 2024 · 16beb43 · 16beb43
1 parent c8b2f9f
commit 16beb43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/actions/action.yml b/.github/actions/action.yml
@@ -75,7 +75,7 @@ runs:
         sudo rm /etc/apt/sources.list.d/*.list
         sudo apt-get update -qq
         sudo apt-get purge -yqq git-man libclang* libgbm* libllvm* libmono* libnginx* moby* mono* nginx* perl php* libgdiplus libpcre2-posix3 libselinux1-dev libzip4
-        sudo apt-get install -yqq --allow-downgrades autoconf/focal automake/focal build-essential/focal git/focal libgd3/focal libglib2.0-0/focal libglib2.0-dev/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal pkg-config/focal clang/focal llvm/focal
+        sudo apt-get install -yqq --allow-downgrades autoconf/focal automake/focal build-essential/focal git/focal libgd3/focal libglib2.0-0/focal libglib2.0-dev/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal pkg-config/focal
         sudo apt-get clean
     - name: Fix GitHub's mess (ubuntu-22.04)
       if: ${{ runner.os == 'Linux' && env.UBUNTU_VERSION == '22.04' }}
@@ -84,7 +84,7 @@ runs:
         sudo rm /etc/apt/sources.list.d/*.list
         sudo apt-get update -qq
         sudo apt-get purge -yqq git-man libclang* libgbm* libllvm* libmono* libnginx* moby* mono* msbuild* nginx* perl php* libgdiplus libpcre2-posix3 libselinux1-dev libzip4
-        sudo apt-get install -y --allow-downgrades git/jammy libatomic1/jammy libc6/jammy libgcc-s1/jammy libglvnd0/jammy libstdc++6/jammy clang/jammy llvm/jammy
+        sudo apt-get install -y --allow-downgrades git/jammy libatomic1/jammy libc6/jammy libgcc-s1/jammy libglvnd0/jammy libstdc++6/jammy
         sudo apt-get clean
 
     # setup build options

diff --git a/Ratatouille/makefile b/Ratatouille/makefile
@@ -65,7 +65,6 @@ endif
 ifeq ($(UNAME_S), Linux)
   ifeq ($(TARGET), Linux)
     CXX_VERSION = $(shell clang++ --version 2>/dev/null)
-    CXXFLAGS := $(filter-out -fno-gnu-unique,$(CXXFLAGS))
     ifdef CXX_VERSION
       CXX := clang++
     endif
@@ -118,7 +117,6 @@ ifeq ($(TARGET), Linux)
 	CXXFLAGS += -fstrength-reduce -fno-fat-lto-objects
 	else
 	CXXFLAGS += -Wno-unused-private-field
-    CXXFLAGS := $(filter-out -fno-gnu-unique,$(CXXFLAGS))
 	endif
 	else
 	CXXFLAGS += -Wno-unused-private-field
@@ -207,7 +205,7 @@ $(EXEC_NAME)_ui.$(LIB_EXT): $(EXEC_NAME).c $(GUIIMPL_SOURCE) $(UI_LIB)
 
 $(EXEC_NAME).$(LIB_EXT): $(EXEC_NAME).cpp $(RTN_SOURCES) $(NAM_SOURCES) $(IMPL_SOURCE)
 	@$(B_ECHO) "Compiling $(EXEC_NAME).$(LIB_EXT) $(reset)"
-	$(CXX) $(filter-out -fno-gnu-unique,$(CXXFLAGS)) $(FAUSTFLAGS) $(EXEC_NAME).cpp $(RTN_SOURCES) $(NAM_SOURCES) $(LDFLAGS) -o $(EXEC_NAME).$(LIB_EXT)
+	$(QUIET)$(CXX) $(CXXFLAGS) $(FAUSTFLAGS) $(EXEC_NAME).cpp $(RTN_SOURCES) $(NAM_SOURCES) $(LDFLAGS) -o $(EXEC_NAME).$(LIB_EXT)
 	$(QUIET)$(STRIP) -s -x -X -R .comment -R .note.ABI-tag $(EXEC_NAME).$(LIB_EXT)
 
 install :