diff --git a/Makefile b/Makefile
index efe040e07..8ce248e7c 100644
--- a/Makefile
+++ b/Makefile
@@ -146,3 +146,13 @@ check: all
 
 deploy: check
 	integration/$(USER)/deploy.sh $(PLATFORM)
+
+lsp_client_glib-build:
+	$(GPRBUILD) -P gnat/lsp_client_glib.gpr -p $(COVERAGE_BUILD_FLAGS) \
+		-XVERSION=$(TRAVIS_TAG)
+
+lsp_client_glib-install:
+	gprinstall -f -P gnat/lsp_client_glib.gpr -p -r	\
+		--mode=dev				\
+		--prefix=$(DESTDIR)			\
+		$(LIBRARY_FLAGS)
diff --git a/gnat/lsp_server.gpr b/gnat/lsp_server.gpr
index 76e6cfcc7..80875d2f7 100644
--- a/gnat/lsp_server.gpr
+++ b/gnat/lsp_server.gpr
@@ -68,6 +68,18 @@ project LSP_Server is
          when "relocatable" =>
             null;
       end case;
+      case LSP.Build_Mode is
+         when "prod" =>
+            null;
+         when "dev" =>
+            case OS is
+               when "osx" | "unix" =>
+                  --  This ensure that address randomization is not active for backtracking
+                  for Switches ("Ada") use Linker'Switches ("ada") & ("-Wl,-no_pie");
+               when others =>
+                  null;
+           end case;
+      end case;
    end Linker;
 
    package Binder is