Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
alabuzhev committed Aug 15, 2024
1 parent b4a0219 commit 291353e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 23 deletions.
9 changes: 0 additions & 9 deletions far/makefile_gcc
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
.SILENT:

ifndef CLANG
ifndef USE_LLD
# LD map files are unusable for tracing,
# so we keep the symbols, objdump them and strip manually.
# LLD, on the contrary, generates good maps and doesn't need this trickery.
USE_OBJDUMP_MAPS=1
endif
endif

include ./makefile_gcc_common
THIS_MAKE = $(TOP_MAKEFILE)

Expand Down
17 changes: 12 additions & 5 deletions far/makefile_gcc_common
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ CFLAGS += -flto

ifndef CLANG
CFLAGS += \
-flarge-source-files \
-flto-odr-type-merging \

endif
Expand All @@ -244,11 +243,16 @@ endif # DEBUG
# Configuration-specific flags end

# Compiler-specific flags
ifdef CLANG
START_NO_UNUSED_ARGS=--start-no-unused-arguments
END_NO_UNUSED_ARGS=--end-no-unused-arguments
endif

PDB_FLAGS = \
-g \
--start-no-unused-arguments \
$(START_NO_UNUSED_ARGS) \
-gcodeview \
--end-no-unused-arguments \
$(END_NO_UNUSED_ARGS) \

LLD_FLAGS = \
-fuse-ld=lld \
Expand Down Expand Up @@ -294,14 +298,17 @@ LNKFLAGS += \
$(CLANG_FLAGS) \
$(LLD_FLAGS) \

ifndef CLANG
else

CFLAGS += \
-flarge-source-files \

ifndef USE_LLD
# LD map files are unusable for tracing,
# so we keep the symbols, objdump them and strip manually.
# LLD, on the contrary, generates good maps and doesn't need this trickery.
USE_OBJDUMP_MAPS=1
endif
endif

endif
# Compiler-specific flags end
Expand Down
9 changes: 0 additions & 9 deletions plugins/makefile_gcc_def_inc
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@ MAKEFILE_DIR := $(dir $(MAKEFILE_PATH))

DEP_FILTER := $(MAKEFILE_DIR)dep_filter.awk

ifndef CLANG
ifndef USE_LLD
# LD map files are unusable for tracing,
# so we keep the symbols, objdump them and strip manually.
# LLD, on the contrary, generates good maps and doesn't need this trickery.
USE_OBJDUMP_MAPS=1
endif
endif

include $(MAKEFILE_DIR)../far/makefile_gcc_common

ifdef ANSI
Expand Down

0 comments on commit 291353e

Please sign in to comment.