Skip to content
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

Jump to bottom

Add wrap for native SoftFloat subproject and use the native dep #4605

Closed
wants to merge 1 commit into from
Closed

Add wrap for native SoftFloat subproject and use the native dep #4605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,16 @@ endif

softfloat_dep = dependency('softfloat', required: get_option('use_sys_softfloat'), static: is_static_build)
if not softfloat_dep.found()
softfloat_proj = subproject('softfloat', default_options: ['default_library=static', 'warning_level=0'])
softfloat_proj = subproject('softfloat', default_options: ['default_library=static'])
softfloat_dep = softfloat_proj.get_variable('softfloat_dep')
endif

if meson.is_cross_build()
softfloat_proj = subproject('softfloat', default_options: ['default_library=static', 'warning_level=0'])
softfloat_native_dep = softfloat_proj.get_variable('softfloat_dep')
softfloat_native_dep = dependency('softfloat_cross_native', required: get_option('use_sys_softfloat'), static: is_static_build, native: true)
if not softfloat_native_dep.found()
softfloat_cross_native_proj = subproject('softfloat_cross_native', default_options: ['default_library=static'])
softfloat_native_dep = softfloat_cross_native_proj.get_variable('softfloat_native_dep')
endif
endif

# handle zip dependency
Expand Down
3 changes: 3 additions & 0 deletions subprojects/softfloat.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ url = https://github.com/rizinorg/softfloat
revision = e06f4fcbdc6b3545c0624ac70725daf95eda53e8
directory = softfloat
depth = 1

[provide]
softfloat=softfloat_dep
9 changes: 9 additions & 0 deletions subprojects/softfloatt_cross_native.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[wrap-git]
url = https://github.com/rizinorg/softfloat
revision = 05dc625eecbccae9113403248cb33730600ed722
directory = softfloat_cross_native
depth = 1

[provide]
dependency_names = softfloat_cross_native
softfloat_cross_native = softfloat_cross_native_dep
Loading