Skip to content

Commit 78196be

Browse files
author
thientc
committed
fix error in build_configure and generator
1 parent a348515 commit 78196be

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed
13 Bytes
Binary file not shown.
13 Bytes
Binary file not shown.

src/python/futag-package/src/futag/generator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2589,7 +2589,7 @@ def compile_targets(self, workers: int = 4, keep_failed: bool = False, extra_par
25892589
current_include.append("-I" + i.as_posix() + "/")
25902590
else:
25912591
for i in include_subdir:
2592-
current_include.append(i.as_posix())
2592+
current_include.append(i)
25932593

25942594
fuzz_driver_dirs = [x for x in func_dir.iterdir() if x.is_dir()]
25952595
for dir in fuzz_driver_dirs:
@@ -4441,7 +4441,7 @@ def compile_targets(self, workers: int = 4, keep_failed: bool = False, extra_par
44414441
current_include.append("-I" + i.as_posix() + "/")
44424442
else:
44434443
for i in include_subdir:
4444-
current_include.append(i.as_posix())
4444+
current_include.append(i)
44454445

44464446
fuzz_driver_dirs = [x for x in func_dir.iterdir() if x.is_dir()]
44474447
for dir in fuzz_driver_dirs:

src/python/futag-package/src/futag/preprocessor.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ def build_cmake(self) -> bool:
277277
]
278278
p = Popen(make_command, stdout=PIPE, stderr=PIPE,
279279
universal_newlines=True, env=my_env)
280-
# universal_newlines=True)
281280

282281
print(LIB_BUILD_COMMAND, " ".join(p.args))
283282
output, errors = p.communicate()
@@ -434,14 +433,14 @@ def build_configure(self) -> bool:
434433
]
435434
if self.processes > 1:
436435
make_command = make_command + ["-j" + str(self.processes)]
437-
make_command = make_command + [
438-
# f"CC={(self.futag_llvm_package / 'bin/clang').as_posix()}",
439-
# f"CXX={(self.futag_llvm_package / 'bin/clang++').as_posix()}",
440-
# f"CFLAGS='{self.flags}'",
441-
# f"CPPFLAGS='{self.flags}'",
442-
# f"CXXFLAGS='{self.flags}'",
443-
# f"LDFLAGS='{self.flags}'",
444-
]
436+
# make_command = make_command + [
437+
# # f"CC={(self.futag_llvm_package / 'bin/clang').as_posix()}",
438+
# # f"CXX={(self.futag_llvm_package / 'bin/clang++').as_posix()}",
439+
# # f"CFLAGS='{self.flags}'",
440+
# # f"CPPFLAGS='{self.flags}'",
441+
# # f"CXXFLAGS='{self.flags}'",
442+
# # f"LDFLAGS='{self.flags}'",
443+
# ]
445444
p = Popen(make_command, stdout=PIPE,
446445
stderr=PIPE, universal_newlines=True, env=my_env)
447446

@@ -543,14 +542,14 @@ def build_makefile(self) -> bool:
543542
make_command = ["make"]
544543
if self.processes > 1:
545544
make_command = make_command + ["-j" + str(self.processes)]
546-
make_command = make_command + [
547-
f"CC={(self.futag_llvm_package / 'bin/clang').as_posix()}",
548-
f"CXX={(self.futag_llvm_package / 'bin/clang++').as_posix()}",
549-
f"CFLAGS={self.flags}",
550-
f"CPPFLAGS={self.flags}",
551-
f"CXXFLAGS={self.flags}",
552-
f"LDFLAGS={self.flags}",
553-
]
545+
# make_command = make_command + [
546+
# f"CC={(self.futag_llvm_package / 'bin/clang').as_posix()}",
547+
# f"CXX={(self.futag_llvm_package / 'bin/clang++').as_posix()}",
548+
# f"CFLAGS={self.flags}",
549+
# f"CPPFLAGS={self.flags}",
550+
# f"CXXFLAGS={self.flags}",
551+
# f"LDFLAGS={self.flags}",
552+
# ]
554553
p = Popen(make_command, stdout=PIPE, stderr=PIPE,
555554
universal_newlines=True, env=my_env)
556555

0 commit comments

Comments
 (0)