Changeset 109479e8 in rtems

Timestamp:

09/18/23 09:46:37 (3 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

853429c3

Parents:

de25f012

git-author:

Sebastian Huber <sebastian.huber@…> (09/18/23 09:46:37)

git-committer:

Sebastian Huber <sebastian.huber@…> (09/22/23 05:59:11)

Message:

build: Remove enabled-by special case

Doing the enabled-by processing just for the ldflags and just for the
link custom commands is confusing. Use an option instead which is
intended to be used for such use cases.

Files:

• spec/build/testsuites/libtests/dl07.yml (modified) (1 diff)
• spec/build/testsuites/libtests/dl08.yml (modified) (1 diff)
• spec/build/testsuites/libtests/dl09.yml (modified) (1 diff)
• spec/build/testsuites/libtests/grp.yml (modified) (1 diff)
• spec/build/testsuites/libtests/optdlldflags.yml (added)
• wscript (modified) (2 diffs)

spec/build/testsuites/libtests/dl07.yml

@@ -34 +34 @@
 - testsuites/libtests/dl07
 ldflags:
-- enabled-by:
-  - microblaze
-  value: -u__extendsfdf2
+- ${LIBDL_TESTS_LDFLAGS}
 links: []
 prepare-build: null

spec/build/testsuites/libtests/dl08.yml

@@ -39 +39 @@
 - testsuites/libtests/dl08
 ldflags:
-- enabled-by:
-  - microblaze
-  value: -u__extendsfdf2
+- ${LIBDL_TESTS_LDFLAGS}
 links: []
 prepare-build: null

spec/build/testsuites/libtests/dl09.yml

@@ -34 +34 @@
 - testsuites/libtests/dl09
 ldflags:
-- enabled-by:
-  - microblaze
-  value: -u__extendsfdf2
+- ${LIBDL_TESTS_LDFLAGS}
 links: []
 prepare-build: null

spec/build/testsuites/libtests/grp.yml

@@ -24 +24 @@
   uid: ../optxz
 - role: build-dependency
+  uid: optdlldflags
+- role: build-dependency
   uid: optrtemsld
 - role: build-dependency

wscript

@@ -361 +361 @@
                 super(link, self).__init__(self, env=env)
                 self.cmd = cmd
-                self.ldflags = bic.ldflags + ldflags
+                self.ldflags = ldflags
                 self.stlib = item.data["stlib"]
                 self.use = (item.data["use-before"] + bic.use +
@@ -387 +387 @@
                 )
 
-        ldflags = []
-        for ldflag in self.data["ldflags"]:
-            if isinstance(ldflag, dict):
-                if _is_enabled(bld.env.ENABLE, ldflag["enabled-by"]):
-                    ldflags.append(ldflag["value"])
-            else:
-                ldflags.append(ldflag)
-        tsk = link(self, bic, cmd, bld.env, ldflags)
+        tsk = link(self, bic, cmd, bld.env,
+                   bic.ldflags + self.substitute(bld, self.data["ldflags"]))
         tsk.set_inputs([bld.bldnode.make_node(s) for s in source])
         tsk.set_outputs(bld.bldnode.make_node(target))