From 0326720cbb9b81a0549b21a963fdd0cf732b5110 Mon Sep 17 00:00:00 2001
From: Stephane Carrez <Stephane.Carrez@gmail.com>
Date: Sun, 21 Jun 2026 09:48:00 +0200
Subject: [PATCH 1/2] Fix #396: Setup fails due to missing directory
 x86_64-pc-linux-gnu/setup/src

Fix the make dependency rules to create the $(STP_DIR)/src: the dependency
must use $(STP_DIR)/src to make sure we use the expected target dir
(the $(SDIR)/src may represent another directory)
---
 config/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Makefile b/config/Makefile
index d6e4c8ffc..39db974a8 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -57,7 +57,7 @@ ifeq ($(ISOOT), true)
 	GPROPTS += --relocate-build-tree=$(BLD_DIR) --root-dir=$(SRC_DIR)
 endif
 
-$(SDIR)/src:
+$(STP_DIR)/src:
 	$(MKDIR) $(STP_DIR)/src
 
 $(PRJ_DIR):
@@ -108,7 +108,7 @@ $(SDIR)/src/aws-os_lib.ads: $(SDIR)/src force
 	$(CP) $(SRC_DIR)/src/os_lib__vxworks.ads \
 		$(STP_DIR)/src/os_lib.ads
 else
-$(SDIR)/src/os_lib.ads: $(SDIR)/src $(XOSCONS)$(EXEEXT) force
+$(SDIR)/src/os_lib.ads: $(STP_DIR)/src $(XOSCONS)$(EXEEXT) force
 	echo Setup OS specific definitions
 	$(CP) $(SRC_DIR)/config/setup/os_lib-tmplt.c $(STP_DIR)/src
 ifeq ($(IS_CROSS), true)

From 1397b204cff1d55d44bb8f6494b096e6aec3eeb3 Mon Sep 17 00:00:00 2001
From: Stephane Carrez <Stephane.Carrez@gmail.com>
Date: Mon, 22 Jun 2026 00:00:41 +0200
Subject: [PATCH 2/2] Fix #396: Setup fails due to missing directory
 x86_64-pc-linux-gnu/setup/src

Also replace other references to the `SDIR` variable which have been removed
by commit dcd2f6d68, we must use STP_DIR.
---
 config/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/Makefile b/config/Makefile
index 39db974a8..fb8a785bf 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -46,7 +46,7 @@ endif
 
 ifeq (${SSL_DYNAMIC}, true)
 NO_SSL_LINK = 1
-SSL_THIN=$(SDIR)/src/ssl-thin.ads
+SSL_THIN=$(STP_DIR)/src/ssl-thin.ads
 endif
 
 GPROPTS = 	-XPRJ_TARGET=$(PRJ_TARGET) -XTARGET=$(TARGET) \
@@ -63,10 +63,10 @@ $(STP_DIR)/src:
 $(PRJ_DIR):
 	$(MKDIR) $(PRJ_DIR)
 
-$(XOSCONS)$(EXEEXT): $(SDIR)/src $(SRC_DIR)/config/setup/xoscons.adb
+$(XOSCONS)$(EXEEXT): $(STP_DIR)/src $(SRC_DIR)/config/setup/xoscons.adb
 	-$(GPRBUILD) -p -XPRJ_BUILD=Debug $(GPROPTS) -Psetup xoscons
 
-$(SDIR)/dynamo$(EXEEXT): $(SDIR)/src $(SRC_DIR)/ssl/dynamo/dynamo.adb
+$(STP_DIR)/dynamo$(EXEEXT): $(STP_DIR)/src $(SRC_DIR)/ssl/dynamo/dynamo.adb
 	-$(GPRBUILD) -p $(GPROPTS) -Pssl/dynamo/dynamo.gpr -g -bargs -E
 
 setup_extlib: $(PRJ_DIR)
@@ -101,14 +101,14 @@ endif
 
 force: ;
 
-setup: $(SDIR)/src/os_lib.ads $(SSL_THIN) setup_extlib
+setup: $(STP_DIR)/src/os_lib.ads $(SSL_THIN) setup_extlib
 
 ifeq (${PRJ_TARGET}, vxworks)
-$(SDIR)/src/aws-os_lib.ads: $(SDIR)/src force
+$(STP_DIR)/src/aws-os_lib.ads: $(STP_DIR)/src force
 	$(CP) $(SRC_DIR)/src/os_lib__vxworks.ads \
 		$(STP_DIR)/src/os_lib.ads
 else
-$(SDIR)/src/os_lib.ads: $(STP_DIR)/src $(XOSCONS)$(EXEEXT) force
+$(STP_DIR)/src/os_lib.ads: $(STP_DIR)/src $(XOSCONS)$(EXEEXT) force
 	echo Setup OS specific definitions
 	$(CP) $(SRC_DIR)/config/setup/os_lib-tmplt.c $(STP_DIR)/src
 ifeq ($(IS_CROSS), true)