Skip to content

Commit d6dd2b6

Browse files
committed
cleanup LDFLAGS/CFLAGS in various components
Signed-off-by: Tim Meusel <tim@bastelfreak.de>
1 parent f58ddcc commit d6dd2b6

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

configs/components/libffi.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,15 @@
55
pkg.load_from_json('configs/components/libffi.json')
66
pkg.mirror "#{settings[:buildsources_url]}/#{pkg.get_name}-#{pkg.get_version}.tar.gz"
77

8+
pkg.environment 'LDFLAGS', settings[:ldflags]
9+
pkg.environment 'CFLAGS', settings[:cflags]
10+
811
if platform.is_macos?
9-
pkg.environment 'LDFLAGS', settings[:ldflags]
10-
pkg.environment 'CFLAGS', settings[:cflags]
1112
pkg.environment 'CC', settings[:cc]
1213
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
1314
elsif platform.is_windows?
1415
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
15-
pkg.environment 'LDFLAGS', settings[:ldflags]
16-
pkg.environment 'CFLAGS', settings[:cflags]
17-
1816
pkg.apply_patch 'resources/patches/libffi/revert_clang_32bit.patch' if platform.architecture == 'x86'
19-
else
20-
pkg.environment 'LDFLAGS', settings[:ldflags]
21-
pkg.environment 'CFLAGS', settings[:cflags]
2217
end
2318

2419
pkg.build_requires "runtime-#{settings[:runtime_project]}"

configs/components/libyaml.rb

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
pkg.load_from_json('configs/components/libyaml.json')
66
pkg.mirror "#{settings[:buildsources_url]}/yaml-#{pkg.get_version}.tar.gz"
77

8+
pkg.environment 'LDFLAGS', settings[:ldflags]
9+
pkg.environment 'CFLAGS', settings[:cflags]
10+
811
if platform.is_macos?
9-
pkg.environment 'LDFLAGS', settings[:ldflags]
10-
pkg.environment 'CFLAGS', settings[:cflags]
1112
pkg.environment 'CC', settings[:cc]
1213
pkg.environment 'MACOSX_DEPLOYMENT_TARGET', settings[:deployment_target]
1314
elsif platform.is_windows?
1415
pkg.environment 'PATH', "$(shell cygpath -u #{settings[:gcc_bindir]}):$(PATH)"
15-
pkg.environment 'LDFLAGS', settings[:ldflags]
16-
pkg.environment 'CFLAGS', settings[:cflags]
17-
else
18-
pkg.environment 'LDFLAGS', settings[:ldflags]
19-
pkg.environment 'CFLAGS', settings[:cflags]
2016
end
2117

2218
pkg.build_requires "runtime-#{settings[:runtime_project]}"

0 commit comments

Comments
 (0)