Include CXXFLAGS in the link step

This commit is contained in:
Eric Severance 2025-01-10 15:39:25 -08:00
parent bd32ecbc71
commit 132536d407
No known key found for this signature in database
GPG Key ID: F19AABB5E1EA1B5F

View File

@ -14,6 +14,7 @@ from SCons.Script import DefaultEnvironment, Literal
env = DefaultEnvironment() env = DefaultEnvironment()
cxxflags = shlex.split(os.getenv("CXXFLAGS"))
sanitizer_flags = shlex.split(os.getenv("SANITIZER_FLAGS")) sanitizer_flags = shlex.split(os.getenv("SANITIZER_FLAGS"))
lib_fuzzing_engine = shlex.split(os.getenv("LIB_FUZZING_ENGINE")) lib_fuzzing_engine = shlex.split(os.getenv("LIB_FUZZING_ENGINE"))
statics = glob.glob("/usr/lib/lib*.a") + glob.glob("/usr/lib/*/lib*.a") statics = glob.glob("/usr/lib/lib*.a") + glob.glob("/usr/lib/*/lib*.a")
@ -34,9 +35,12 @@ def replaceStatic(lib):
# Setup the environment for building with Clang and the OSS-Fuzz required build flags. # Setup the environment for building with Clang and the OSS-Fuzz required build flags.
env.Append( env.Append(
CFLAGS=os.getenv("CFLAGS"), CFLAGS=os.getenv("CFLAGS"),
CXXFLAGS=os.getenv("CXXFLAGS"), CXXFLAGS=cxxflags,
LIBSOURCE_DIRS=["/usr/lib/x86_64-linux-gnu"], LIBSOURCE_DIRS=["/usr/lib/x86_64-linux-gnu"],
LINKFLAGS=sanitizer_flags + lib_fuzzing_engine + ["-stdlib=libc++", "-std=c++17"], LINKFLAGS=cxxflags
+ sanitizer_flags
+ lib_fuzzing_engine
+ ["-stdlib=libc++", "-std=c++17"],
_LIBFLAGS=[replaceStatic(s) for s in shlex.split(os.getenv("STATIC_LIBS"))] _LIBFLAGS=[replaceStatic(s) for s in shlex.split(os.getenv("STATIC_LIBS"))]
+ [ + [
"/usr/lib/x86_64-linux-gnu/libunistring.a", # Needs to be at the end. "/usr/lib/x86_64-linux-gnu/libunistring.a", # Needs to be at the end.