|
Lines 159-165
_meson_create_cross_file() {
Link Here
|
| 159 |
_meson_get_machine_info "${CHOST}" |
159 |
_meson_get_machine_info "${CHOST}" |
| 160 |
|
160 |
|
| 161 |
local fn=${T}/meson.${CHOST}.${ABI}.ini |
161 |
local fn=${T}/meson.${CHOST}.${ABI}.ini |
|
|
162 |
local options |
| 162 |
|
163 |
|
|
|
164 |
if has_version '<dev-util/meson-0.56.0'; then |
| 165 |
options="[properties]" |
| 166 |
else |
| 167 |
options="[built-in options]" |
| 168 |
fi |
| 163 |
cat > "${fn}" <<-EOF |
169 |
cat > "${fn}" <<-EOF |
| 164 |
[binaries] |
170 |
[binaries] |
| 165 |
ar = $(_meson_env_array "$(tc-getAR)") |
171 |
ar = $(_meson_env_array "$(tc-getAR)") |
|
Lines 174-180
_meson_create_cross_file() {
Link Here
|
| 174 |
strip = $(_meson_env_array "$(tc-getSTRIP)") |
180 |
strip = $(_meson_env_array "$(tc-getSTRIP)") |
| 175 |
windres = $(_meson_env_array "$(tc-getRC)") |
181 |
windres = $(_meson_env_array "$(tc-getRC)") |
| 176 |
|
182 |
|
| 177 |
[properties] |
183 |
${options} |
| 178 |
c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") |
184 |
c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") |
| 179 |
c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") |
185 |
c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") |
| 180 |
cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") |
186 |
cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") |
|
Lines 210-216
_meson_create_native_file() {
Link Here
|
| 210 |
_meson_get_machine_info "${CBUILD}" |
216 |
_meson_get_machine_info "${CBUILD}" |
| 211 |
|
217 |
|
| 212 |
local fn=${T}/meson.${CBUILD}.${ABI}.ini |
218 |
local fn=${T}/meson.${CBUILD}.${ABI}.ini |
|
|
219 |
local options |
| 213 |
|
220 |
|
|
|
221 |
if has_version '<dev-util/meson-0.56.0'; then |
| 222 |
options="[properties]" |
| 223 |
else |
| 224 |
options="[built-in options]" |
| 225 |
fi |
| 214 |
cat > "${fn}" <<-EOF |
226 |
cat > "${fn}" <<-EOF |
| 215 |
[binaries] |
227 |
[binaries] |
| 216 |
ar = $(_meson_env_array "$(tc-getBUILD_AR)") |
228 |
ar = $(_meson_env_array "$(tc-getBUILD_AR)") |
|
Lines 225-231
_meson_create_native_file() {
Link Here
|
| 225 |
strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") |
237 |
strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") |
| 226 |
windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") |
238 |
windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") |
| 227 |
|
239 |
|
| 228 |
[properties] |
240 |
${options} |
| 229 |
c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") |
241 |
c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") |
| 230 |
c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") |
242 |
c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") |
| 231 |
cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") |
243 |
cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") |
| 232 |
- |
|
|
