Skip to content

build system: keep flag "-stdlib=libc++" private in pkg-config files #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2024
Merged

build system: keep flag "-stdlib=libc++" private in pkg-config files #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc1add4
build system: kepp flag "-stdlib=libc++" private in pkg-config files
Totto16 Jun 28, 2024
5a7db3c
CI: small newline fix
Totto16 Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
library_type: static
shell: "msys2 {0}"


- name: Linux Release
os: ubuntu
os-version: 24.04
Expand Down
17 changes: 8 additions & 9 deletions src/libs/core/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,18 @@ liboopetris_core = library(
version: meson.project_version(),
install: true,
)
## remove '-stdlib=libc++' from the list, if it's present
core_dep_compile_args = []
foreach value : core_lib.get('compile_args')
if value != '-stdlib=libc++'
core_dep_compile_args += value
endif
endforeach

liboopetris_core_dep = declare_dependency(
link_with: liboopetris_core,
include_directories: core_lib.get('inc_dirs'),
compile_args: core_lib.get('compile_args'),
compile_args: core_dep_compile_args,
dependencies: core_lib.get('deps'),
version: meson.project_version(),
)
Expand All @@ -37,14 +44,6 @@ install_headers(
preserve_path: true,
)

## remove '-stdlib=libc++' from the list, if it's present
core_dep_compile_args = []
foreach value : core_lib.get('compile_args')
if value != '-stdlib=libc++'
core_dep_compile_args += value
endif
endforeach

# generate pkgconfig files
pkg = import('pkgconfig')

Expand Down
13 changes: 11 additions & 2 deletions src/libs/recordings/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,19 @@ liboopetris_recordings = library(
install: true,
)

## remove '-stdlib=libc++' from the list, if it's present
recordings_dep_compile_args = []
foreach value : recordings_lib.get('compile_args')
if value != '-stdlib=libc++'
recordings_dep_compile_args += value
endif
endforeach


liboopetris_recordings_dep = declare_dependency(
link_with: liboopetris_recordings,
include_directories: recordings_lib.get('inc_dirs'),
compile_args: recordings_lib.get('compile_args'),
compile_args: recordings_dep_compile_args,
dependencies: recordings_lib.get('deps'),
version: meson.project_version(),
)
Expand All @@ -48,7 +57,7 @@ pkg.generate(
name: 'oopetris-recordings',
filebase: 'oopetris-recordings',
subdirs: 'oopetris',
extra_cflags: recordings_lib.get('compile_args'),
extra_cflags: recordings_dep_compile_args,
variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib],
)

Expand Down