Skip to content

Commit

Permalink
re-enable clang on action build
Browse files Browse the repository at this point in the history
  • Loading branch information
brummer10 committed Jan 14, 2025
1 parent 7638e17 commit b5ad5c9
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Ratatouille/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,11 @@ ifeq ($(TARGET), Linux)
-Wno-vla-cxx-extension -Wno-nan-infinity-disabled
endif

# remove unwanted flags from PawPaw
ifneq (,$(findstring clang, $(CXX)))
CXXFLAGS := $(filter-out -fno-gnu-unique,$(CXXFLAGS))
LDFLAGS := $(filter-out -fno-gnu-unique,$(LDFLAGS))
endif

SLP_LDFLAGS += -fvisibility=hidden -Wl,-Bstatic `pkg-config --cflags --libs xputty` \
-Wl,-Bdynamic `pkg-config --cflags --libs cairo x11 lilv-0` \
Expand Down Expand Up @@ -362,7 +365,7 @@ $(EXEC_NAME)_ui.$(LIB_EXT): $(EXEC_NAME).c $(GUIIMPL_SOURCE) $(UI_LIB)

$(EXEC_NAME).$(LIB_EXT): $(EXEC_NAME).cpp $(NEURAL_LIB) $(CONV_LIB) $(RESAMP_LIB)
@$(B_ECHO) "Compiling $(EXEC_NAME).$(LIB_EXT) $(reset)"
$(CXX) $(CXXFLAGS) $(NAM_INCLUDES) $(RTN_INCLUDES) $(EXEC_NAME).cpp \
$(QUIET)$(CXX) $(CXXFLAGS) $(NAM_INCLUDES) $(RTN_INCLUDES) $(EXEC_NAME).cpp \
-L. $(NEURAL_LIB) -L. $(CONV_LIB) -L. $(RESAMP_LIB) $(LDFLAGS) -o $@
$(QUIET)$(STRIP) -s -x -X -R .comment -R .note.ABI-tag $(EXEC_NAME).$(LIB_EXT)

Expand Down

0 comments on commit b5ad5c9

Please sign in to comment.