summaryrefslogtreecommitdiffhomepage
path: root/subr.pkg
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-28 12:09:31 +0200
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2023-03-28 12:09:31 +0200
commit07bfbd1de0220f6e4ee4078e92e630e1cae7465c (patch)
treef84c1ed8b9256b23a95219605383d7754b517758 /subr.pkg
parent107e294b6e0896c0a9c32f3a17ba9cab1b8dcdda (diff)
downloadmidipix_build-07bfbd1de0220f6e4ee4078e92e630e1cae7465c.tar.bz2
midipix_build-07bfbd1de0220f6e4ee4078e92e630e1cae7465c.tar.xz
subr.ex/ex_rtl_configure.subr:ex_rtl_configure_cmake(): correctly process @_build_{kind,type}.
subr.pkg/pkg_configure.subr: correctly pass @_build_{kind,type}.
Diffstat (limited to 'subr.pkg')
-rw-r--r--subr.pkg/pkg_configure.subr10
1 files changed, 6 insertions, 4 deletions
diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index f712c2e7..60c46f53 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -40,8 +40,9 @@ pkgp_configure_cmake() {
_ppcc_rc=2;
else
case "${BUILD_KIND}" in
- debug) _ppcc_build_type="debug"; ;;
- release|*) _ppcc_build_type="release"; ;;
+ debug) _ppcc_build_type="Debug"; ;;
+ release) _ppcc_build_type="Release"; ;;
+ *) return 1; ;;
esac;
case "${PKG_BUILD_TYPE}" in
@@ -57,8 +58,9 @@ pkgp_configure_cmake() {
"${PKG_AR}" "${PKG_CC}" "${ARG_CCACHE:-}" "${PKG_CMAKE}" "${PKG_CXX}" \
"${PKG_LD}" "${PKG_PKG_CONFIG}" "${PKG_PYTHON:-}" "${PKG_RANLIB}" \
-- \
- "${_ppcc_build_type}" "${PKG_CMAKE_ARGS:-}" "${PKG_CMAKE_ARGS_EXTRA:-}" \
- "${PKG_PREFIX}" "${PKG_BASE_DIR}/${PKG_SUBDIR}" "${_ppcc_system_name}" \
+ "${_ppc_build_type}" "${PKG_BUILD_TYPE}" "${PKG_CMAKE_ARGS:-}" \
+ "${PKG_CMAKE_ARGS_EXTRA:-}" "${PKG_PREFIX}" \
+ "${PKG_BASE_DIR}/${PKG_SUBDIR}" "${_ppcc_system_name}" \
"${_ppcc_system_processor}" \
-- \
"${PKG_CFLAGS_CONFIGURE:-}" "${PKG_CFLAGS_CONFIGURE_EXTRA:-}" \