Skip to content

Commit fb908b9

Browse files
committed
(PA-6383) build augeas and libedit with shared compiler settings
1 parent cfa0363 commit fb908b9

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

configs/components/augeas.rb

+9-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,15 @@
125125
end
126126
end
127127

128-
if platform.name =~ /sles-15|el-8|debian-10/ || platform.is_fedora?
128+
# conditional taken from projects/_shared-compiler-settings
129+
# TODO: refactor condition
130+
if ((platform.is_sles? && platform.os_version.to_i >= 15) ||
131+
(platform.is_el? && platform.os_version.to_i >= 8) ||
132+
platform.is_debian? ||
133+
(platform.is_ubuntu? && platform.os_version.to_i >= 20) ||
134+
(platform.is_amazon? && platform.os_version.to_i >= 2023) ||
135+
platform.is_fedora?
136+
)
129137
pkg.environment 'CFLAGS', settings[:cflags]
130138
pkg.environment 'CPPFLAGS', settings[:cppflags]
131139
pkg.environment "LDFLAGS", settings[:ldflags]

configs/components/libedit.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
elsif platform.is_aix?
1212
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
1313
pkg.environment "LDFLAGS", settings[:ldflags]
14-
end
15-
16-
if platform.is_macos?
14+
else
15+
pkg.environment "LDFLAGS", settings[:ldflags]
1716
pkg.environment "CFLAGS", settings[:cflags]
1817
end
1918

0 commit comments

Comments
 (0)