Fix build issues for LLVM based toolchains. #1513
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
AdelKS
reviewed
Dec 28, 2024
| if is_libcxx | ||
| message('Detected libcxx, not appending -static-libstc++ to linker arguments') | ||
| else | ||
| link_args+=['-static-libstdc++'] |
There was a problem hiding this comment.
@flightlessmango can't this be left for packagers / users to add with meson with -D cpp_link_args when/if needed ?
There was a problem hiding this comment.
Maybe a case where its enabled by default and you have to disable it yourself for the cases where its not desirable (libcxx / no static libstdc++ available).
| @@ -211,11 +209,25 @@ mangohud_shared_lib = shared_library( | |||
| 'MangoHud', | |||
| objects: mangohud_static_lib.extract_all_objects(), | |||
| link_with: mangohud_static_lib, | |||
| link_args : link_args, | |||
| link_args : [link_args, '-Wl,--version-script,@0@'.format(join_paths(meson.current_source_dir(), 'mangohud.version'))], | |||
There was a problem hiding this comment.
This is a lot of duplication, should probably be a variable
There was a problem hiding this comment.
Not sure about how to do that nicer, I have unique files for all libs and mangohub_opengl uses a different directory as its generated at build time.
Could also break it into several lines like in the example given in this meson issue about improving mesons handling for these.
LLD is stricter with version scripts and will complain about nonexisting symbols in version files. Signed-off-by: Alfred Wingate <[email protected]>
Clang has a long standing bug where it will try to mix c++ libraries instead of erroring out early or transparently linking against libcxx statically instead. Signed-off-by: Alfred Wingate <[email protected]>
LLVM alternative C++ standard library is happier if it can hide its own
symbols first without preprocessor macros complicating things.
FAILED: amdgpu.p/tests_test_amdgpu.cpp.o
clang++ -Iamdgpu.p -I. -I.. -I../include -I../subprojects/spdlog-1.14.1/include -Isubprojects/implot-0.16 -I../subprojects/implot-0.16 -Isubprojects/imgui-1.89.9 -I../subprojects/imgui-1.89.9 -I../subprojects/imgui-1.89.9/backends -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c++14 -O3 -Werror=missing-declarations -Werror=return-type -Wno-unused-parameter -Qunused-arguments -fno-math-errno -fno-trapping-math -Wno-non-virtual-dtor -Wno-missing-field-initializers -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS '-DPACKAGE_VERSION="v0.7.2"' -DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG -D_GNU_SOURCE -DHAVE_PTHREAD -DUSE_GCC_ATOMIC_BUILTINS -DHAVE_TIMESPEC_GET -DHAVE___BUILTIN_BSWAP32 -DHAVE___BUILTIN_BSWAP64 -DHAVE___BUILTIN_CLZ -DHAVE___BUILTIN_CLZLL -DHAVE___BUILTIN_CTZ -DHAVE___BUILTIN_EXPECT -DHAVE___BUILTIN_FFS -DHAVE___BUILTIN_FFSLL -DHAVE___BUILTIN_POPCOUNT -DHAVE___BUILTIN_POPCOUNTLL -DHAVE___BUILTIN_UNREACHABLE -O2 -pipe '-DIMGUI_API=__attribute__((visibility("default")))' -pthread -DSPDLOG_COMPILED_LIB -DTEST_ONLY -MD -MQ amdgpu.p/tests_test_amdgpu.cpp.o -MF amdgpu.p/tests_test_amdgpu.cpp.o.d -o amdgpu.p/tests_test_amdgpu.cpp.o -c ../tests/test_amdgpu.cpp
In file included from ../tests/test_amdgpu.cpp:9:
In file included from ../tests/../src/amdgpu.h:6:
In file included from ../tests/../src/overlay_params.h:6:
In file included from /usr/include/c++/v1/vector:3023:
In file included from /usr/include/c++/v1/locale:212:
/usr/include/c++/v1/ios:343:30: error: expected parameter declarator
343 | _LIBCPP_HIDE_FROM_ABI bool fail() const;
| ^
/usr/include/cmocka.h:1616:22: note: expanded from macro 'fail'
1616 | #define fail() _fail(__FILE__, __LINE__)
| ^
<scratch space>:2:1: note: expanded from here
2 | "/usr/include/c++/v1/ios"
Signed-off-by: Alfred Wingate <[email protected]>
Signed-off-by: Alfred Wingate <[email protected]>
parona-source
force-pushed
the
llvm-build
branch
from
ae83e08 to
6c6f4ea
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Keeping it a draft as this would in its current state break builds for Windows. I'm unsure what is the intent with mangohud_opengl and what symbols should be visible in it for Windows.With LLVM toolchain I mean clang as the compiler, lld is the linker and libcxx as the c++ stdlib.
I didn't touch mangohud_shim, but its visible symbols are shown as well. It could also be explicitly specified like mangohud_opengl.
Current HEAD built with GCC/ld.bfd