8121518

config/software/gitaly.rb

@@ -48,17 +48,13 @@ source git: version.remote
 build do
   env = with_standard_compiler_flags(with_embedded_path)
 
-  # 设置包含路径和链接路径
+  # 修正CFLAGS和LDFLAGS以显式指定iconv库路径
   env["CFLAGS"] << " -I/opt/gitlab/embedded/include"
-  env["LDFLAGS"] << " -L/opt/gitlab/embedded/lib -liconv"
-  
-  # 为了解决libtinfo.so.6问题添加额外的库路径和LD_LIBRARY_PATH
-  env["LD_LIBRARY_PATH"] = "/opt/gitlab/embedded/lib"
+  env["LDFLAGS"] << " -L/opt/gitlab/embedded/lib -L/opt/gitlab/embedded/lib -liconv"
 
-  # 打印出环境变量，帮助调试
-  command "echo 'CFLAGS is #{env["CFLAGS"]}'"
-  command "echo 'LDFLAGS is #{env["LDFLAGS"]}'"
-  command "echo 'LD_LIBRARY_PATH is #{env["LD_LIBRARY_PATH"]}'"
+  # 确认环境变量设置是否正确
+  command "echo $CFLAGS"
+  command "echo $LDFLAGS"
 
   if Build::Check.use_system_ssl?
     env['CMAKE_FLAGS'] = OpenSSLHelper.cmake_flags