Linux: Remove hardcoded lib path for x86 cross-compilation
This breaks the build with our updated i686 Linux SDK which doesn't contain this path, and may not be needed at all. This might need further work to be robust, and there's an open PR already adding -march flags for all supported architectures, but for now we're playing it safe for 4.2.
This commit is contained in:
parent
6afd320984
commit
63153c9d36
1 changed files with 10 additions and 11 deletions
|
@ -85,6 +85,16 @@ def configure(env: "Environment"):
|
|||
# gdb works fine without it though, so maybe our crash handler could too.
|
||||
env.Append(LINKFLAGS=["-rdynamic"])
|
||||
|
||||
# Cross-compilation
|
||||
# TODO: Support cross-compilation on architectures other than x86.
|
||||
host_is_64_bit = sys.maxsize > 2**32
|
||||
if host_is_64_bit and env["arch"] == "x86_32":
|
||||
env.Append(CCFLAGS=["-m32"])
|
||||
env.Append(LINKFLAGS=["-m32"])
|
||||
elif not host_is_64_bit and env["arch"] == "x86_64":
|
||||
env.Append(CCFLAGS=["-m64"])
|
||||
env.Append(LINKFLAGS=["-m64"])
|
||||
|
||||
# CPU architecture flags.
|
||||
if env["arch"] == "rv64":
|
||||
# G = General-purpose extensions, C = Compression extension (very common).
|
||||
|
@ -469,22 +479,11 @@ def configure(env: "Environment"):
|
|||
if platform.system() == "FreeBSD":
|
||||
env.Append(LINKFLAGS=["-lkvm"])
|
||||
|
||||
## Cross-compilation
|
||||
# TODO: Support cross-compilation on architectures other than x86.
|
||||
host_is_64_bit = sys.maxsize > 2**32
|
||||
if host_is_64_bit and env["arch"] == "x86_32":
|
||||
env.Append(CCFLAGS=["-m32"])
|
||||
env.Append(LINKFLAGS=["-m32", "-L/usr/lib/i386-linux-gnu"])
|
||||
elif not host_is_64_bit and env["arch"] == "x86_64":
|
||||
env.Append(CCFLAGS=["-m64"])
|
||||
env.Append(LINKFLAGS=["-m64", "-L/usr/lib/i686-linux-gnu"])
|
||||
|
||||
# Link those statically for portability
|
||||
if env["use_static_cpp"]:
|
||||
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
|
||||
if env["use_llvm"] and platform.system() != "FreeBSD":
|
||||
env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
|
||||
|
||||
else:
|
||||
if env["use_llvm"] and platform.system() != "FreeBSD":
|
||||
env.Append(LIBS=["atomic"])
|
||||
|
|
Loading…
Reference in a new issue