From bb85278748633dbf21c2012d985fe092795f837b Mon Sep 17 00:00:00 2001
From: CYFS <2805686936@qq.com>
Date: Wed, 22 Jul 2026 10:09:38 +0800
Subject: [PATCH] [bsp] Fix HC32 and HT32 variant builds

---
 bsp/hc32/tests/SConscript                          | 11 ++++++-----
 bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/SConscript |  2 +-
 bsp/ht32/libraries/HT32_STD_5xxxx_FWLib/SConscript |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bsp/hc32/tests/SConscript b/bsp/hc32/tests/SConscript
index 047375d4c4..a9f3d9f1e2 100644
--- a/bsp/hc32/tests/SConscript
+++ b/bsp/hc32/tests/SConscript
@@ -30,12 +30,13 @@ if GetDepend(['BSP_USING_I2C']):
 if GetDepend(['BSP_USING_ETH', 'RT_USING_LWIP']):
     src += ['test_eth.c']
     #lwIP: HTTP server
-    lwiphttp_src = []
+    lwiphttp_path = os.path.join(RTT_ROOT, 'components', 'net', 'lwip', 'lwip-2.1.2', 'src', 'apps', 'http')
+    VariantDir('lwip_http', lwiphttp_path, duplicate=0)
     lwiphttp_src = Split("""
-    ../../../components/net/lwip/lwip-2.1.2/src/apps/http/altcp_proxyconnect.c
-    ../../../components/net/lwip/lwip-2.1.2/src/apps/http/fs.c
-    ../../../components/net/lwip/lwip-2.1.2/src/apps/http/http_client.c
-    ../../../components/net/lwip/lwip-2.1.2/src/apps/http/httpd.c
+    lwip_http/altcp_proxyconnect.c
+    lwip_http/fs.c
+    lwip_http/http_client.c
+    lwip_http/httpd.c
     """)
     src += lwiphttp_src
 
diff --git a/bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/SConscript b/bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/SConscript
index 1aba501a89..51cae3c0bc 100644
--- a/bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/SConscript
+++ b/bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/SConscript
@@ -11,7 +11,7 @@ tools_paths = [
 sys.path.extend(tools_paths)
 from sdk_dist import get_source
 
-source_file_path = os.path.join(os.getcwd(), 'Source_file')
+source_file_path = os.path.join(GetCurrentDir(), 'Source_file')
 base_path = 'library/HT32F1xxxx_Driver/src/'
 system_path = 'library/Device/Holtek/HT32F1xxxx/Source/'
 source_path = []
diff --git a/bsp/ht32/libraries/HT32_STD_5xxxx_FWLib/SConscript b/bsp/ht32/libraries/HT32_STD_5xxxx_FWLib/SConscript
index 1c04c1f5c6..42d0e55bc8 100644
--- a/bsp/ht32/libraries/HT32_STD_5xxxx_FWLib/SConscript
+++ b/bsp/ht32/libraries/HT32_STD_5xxxx_FWLib/SConscript
@@ -11,7 +11,7 @@ tools_paths = [
 sys.path.extend(tools_paths)
 from sdk_dist import get_source
 
-source_file_path = os.path.join(os.getcwd(), 'Source_file')
+source_file_path = os.path.join(GetCurrentDir(), 'Source_file')
 base_path = 'library/HT32F5xxxx_Driver/src/'
 system_path = 'library/Device/Holtek/HT32F5xxxx/Source/'
 source_path = []