[rtems-tools commit] add libiberty/argv.c for mingw32 build

Sebastian Huber sebh at rtems.org
Thu Feb 29 08:56:08 UTC 2024


Module:    rtems-tools
Branch:    master
Commit:    ce16c8084093f8a54afdd2d22954e41588a2bc81
Changeset: http://git.rtems.org/rtems-tools/commit/?id=ce16c8084093f8a54afdd2d22954e41588a2bc81

Author:    zhengxiaojun <jameszxj at gmail.com>
Date:      Thu Nov 30 14:38:13 2023 +0800

add libiberty/argv.c for mingw32 build

Signed-off-by: zhengxiaojun <jameszxj at gmail.com>

Close #4974.

---

 rtemstoolkit/wscript | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript
index 20b1047..0611e2e 100644
--- a/rtemstoolkit/wscript
+++ b/rtemstoolkit/wscript
@@ -399,9 +399,9 @@ def conf_libiberty(conf):
 def bld_libiberty(bld, conf):
     defines = ['HAVE_CONFIG_H=1']
     if bld.env.DEST_OS == 'win32':
-        pex_host = 'libiberty/pex-win32.c'
+        pex_host = ['libiberty/pex-win32.c','libiberty/argv.c']
     else:
-        pex_host = 'libiberty/pex-unix.c'
+        pex_host = ['libiberty/pex-unix.c']
         if bld.env.DEST_OS == 'darwin':
             defines += ['HAVE_SPAWN_H=1', 'HAVE_POSIX_SPAWN=1', 'HAVE_POSIX_SPAWNP=1']
     bld.stlib(target = 'iberty',
@@ -410,8 +410,7 @@ def bld_libiberty(bld, conf):
               includes = ['libiberty'],
               cflags = conf['cflags'],
               defines = defines,
-              source =['libiberty/argv.c',
-                       'libiberty/concat.c',
+              source =['libiberty/concat.c',
                        'libiberty/cplus-dem.c',
                        'libiberty/cp-demangle.c',
                        'libiberty/d-demangle.c',
@@ -426,8 +425,7 @@ def bld_libiberty(bld, conf):
                        'libiberty/xmalloc.c',
                        'libiberty/xmemdup.c',
                        'libiberty/xstrdup.c',
-                       'libiberty/xstrerror.c',
-                       pex_host])
+                       'libiberty/xstrerror.c'] + pex_host)
 
 #
 # The doxy command.



More information about the vc mailing list