]> git.puffer.fish Git - matthieu/frr.git/commitdiff
build: fix LLVM bitcode per-target CFLAGS
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 26 May 2022 09:55:51 +0000 (11:55 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 26 May 2022 14:11:12 +0000 (16:11 +0200)
When automake decides to customize CFLAGS, use those for building LLVM
bitcode files too.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
python/makefile.py

index 44658013b3f49e2826a5f9422aeb5e033bef399e..64d02bbe50332cd94830d8f10e972dafb6c302a3 100644 (file)
@@ -113,10 +113,19 @@ while lines:
 
     target, dep = m.group(1), m.group(2)
 
+    filename = os.path.basename(target)
+    if '-' in filename:
+        am_name, _ = filename.split('-', 1)
+        am_name = os.path.join(os.path.dirname(target), am_name)
+        am_name = am_name.replace('/', '_')
+        extraflags = " $(%s_CFLAGS)" % (am_name,)
+    else:
+        extraflags = ""
+
     if target.endswith(".lo") or target.endswith(".o"):
         if not dep.endswith(".h"):
             bcdeps.append("%s.bc: %s" % (target, target))
-            bcdeps.append("\t$(AM_V_LLVM_BC)$(COMPILE) -emit-llvm -c -o $@ %s" % (dep))
+            bcdeps.append("\t$(AM_V_LLVM_BC)$(COMPILE)%s -emit-llvm -c -o $@ %s" % (extraflags, dep))
     if m.group(2) in clippy_scan:
         out_lines.append(
             clippyauxdep.substitute(target=m.group(1), clippybase=m.group(2)[:-2])