Skip to content

Commit 7407fd0

Browse files
Merge branch 'topic/als.1494.compile_s_memory' into 'master'
s-memory.adb must be recompiled by the ALS Closes #1494 See merge request eng/ide/ada_language_server!1777
2 parents 499f02a + 60627a5 commit 7407fd0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ all: coverage-instrument
107107
ifeq ($(ALIRE),True)
108108
alr build -- -XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) $(GPRBUILD_FLAGS)
109109
else
110+
# We have our own s-memory.adb which overwrites the default System.Memory implementation
111+
# For unclear reasons, this file is not recompiled when the version of GNAT was changed
112+
# and we get link errors. As a workaround, we force its recompilation explicitly here.
113+
$(GPRBUILD) -d -ws -c -u -P gnat/lsp_server.gpr -p $(BUILD_FLAGS) s-memory.adb
110114
$(GPRBUILD) -P gnat/lsp_server.gpr -p $(COVERAGE_BUILD_FLAGS) \
111115
-XVERSION=$(VERSION) -XBUILD_DATE=$(BUILD_DATE) $(GPRBUILD_CARGS)
112116
endif

0 commit comments

Comments
 (0)