From 2edf6192479c24d4b9fde63e3d4864a48e94ead5 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 15 Feb 2021 11:10:35 +0100 Subject: [PATCH] makepanda: Fix building without bison New prebuilt parser.yxx.cxx does an #include of parser.yxx.h --- makepanda/makepanda.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 9153adfc20..faa81eb29e 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1420,8 +1420,9 @@ def CompileCxx(obj,src,opts): def CompileBison(wobj, wsrc, opts): ifile = os.path.basename(wsrc) - wdsth = GetOutputDir()+"/include/" + ifile[:-4] + ".h" - wdstc = GetOutputDir()+"/tmp/" + ifile + ".cxx" + wdsth = GetOutputDir() + "/include/" + ifile[:-4] + ".h" + wdsth2 = GetOutputDir() + "/tmp/" + ifile + ".h" + wdstc = GetOutputDir() + "/tmp/" + ifile + ".cxx" pre = GetValueOption(opts, "BISONPREFIX_") bison = GetBison() if bison is None: @@ -1431,6 +1432,7 @@ def CompileBison(wobj, wsrc, opts): os.path.isfile(base + '.cxx.prebuilt'): CopyFile(wdstc, base + '.cxx.prebuilt') CopyFile(wdsth, base + '.h.prebuilt') + CopyFile(wdsth2, base + '.h.prebuilt') else: exit('Could not find bison!') else: