From e9e7412fdf98292459bdd09bfc2f6107cb604ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Wed, 25 Oct 2017 20:27:43 +0200
Subject: vars/build.vars: build mdso_host prior to toolchain and
 {psxtypes,ldso}_host prior to the runtime components.
 vars/build.vars:mdso{,_host}: additionally install mdso to
 ${TARGET}/bin/mdso. vars/build.vars:ldso_host: additionally install libldso.a
 to ${PREFIX}/lib/libldso.a. vars/build.vars:ldso: additionally install
 libldso.a to ${TARGET}/lib/libldso.a. vars/build.vars:python3: pass
 -mout-dsolib vs. -mout-implib in ${BLDSHARED} (via midipix.)
 subr/build.subr:install_files(): fix -v flag & only prepend ${_prefix} w/
 relative pathnames during {ln,mkdir,cp}. subr/pre_subdirs.subr:pre_subdirs():
 mkdir ${PREFIX_TARGET}/bin. vars/gcc.vars:pkgp_gcc_setup_env(): pass -midata
 in ${GCCTARGET_FLAGS} (via midipix.)

---
 subr/build.subr       | 17 +++++++++++++----
 subr/pre_subdirs.subr |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'subr')

diff --git a/subr/build.subr b/subr/build.subr
index 1ce52c3c..0e5bea4e 100644
--- a/subr/build.subr
+++ b/subr/build.subr
@@ -48,7 +48,7 @@ install_files() {
 	local _verbose _prefix _ln_target _ln_fname _mkdir_fname	\
 		_file_fname_src _file_fname_dst;
 	if [ "${1}" = "-v" ]; then
-		_verbose="${1}"; shift;
+		_verbose=1; shift;
 	fi; _prefix="${1}"; shift;
 	while [ ${#} -gt 0 ]; do
 	case "${1}" in
@@ -56,22 +56,31 @@ install_files() {
 		_ln_target="${1%=*}";
 		_ln_target="${_ln_target#@}";
 		_ln_fname="${1#*=}";
+		if [ "${_ln_fname#/}" = "${_ln_fname}" ]; then
+			_ln_fname="${_prefix:+${_prefix}/}${_ln_fname}";
+		fi;
 		if [ -e "${_ln_fname}" ]; then
 			if [ ${_verbose:-0} -eq 1 ]; then
 				echo build_fileop rm "${_ln_fname}";
 			fi;
 			build_fileop rm "${_ln_fname}";
 		fi;
-		build_fileop ln_symbolic "${_ln_target}" "${_prefix:+${_prefix}/}${_ln_fname}";
+		build_fileop ln_symbolic "${_ln_target}" "${_ln_fname}";
 		;;
 	/=*)
 		_mkdir_fname="${1#/=}";
-		build_fileop mkdir "${_prefix:+${_prefix}/}${_mkdir_fname}";
+		if [ "${_mkdir_fname#/}" = "${_mkdir_fname}" ]; then
+			_mkdir_fname="${_prefix:+${_prefix}/}${_mkdir_fname}";
+		fi;
+		build_fileop mkdir "${_mkdir_fname}";
 		;;
 	*)
 		_file_fname_src="${1%=*}";
 		_file_fname_dst="${1#*=}";
-		build_fileop cp "${_file_fname_src}" "${_prefix:+${_prefix}/}${_file_fname_dst}";
+		if [ "${_file_fname_dst#/}" = "${_file_fname_dst}" ]; then
+			_file_fname_dst="${_prefix:+${_prefix}/}${_file_fname_dst}";
+		fi;
+		build_fileop cp "${_file_fname_src}" "${_file_fname_dst}";
 		;;
 	esac; shift;
 	done;
diff --git a/subr/pre_subdirs.subr b/subr/pre_subdirs.subr
index 92980b80..bf997b72 100644
--- a/subr/pre_subdirs.subr
+++ b/subr/pre_subdirs.subr
@@ -20,6 +20,7 @@ pre_subdirs() {
 		/=${PREFIX_CROSS}				\
 		/=${PREFIX_MINIPIX}/bin				\
 		/=${PREFIX_NATIVE}				\
+		/=${PREFIX_TARGET}/bin				\
 		/=${PREFIX_TARGET}/lib				\
 		@.=${PREFIX}/usr				\
 		@.=${PREFIX}/x86_64-w64-mingw32/mingw		\
-- 
cgit v1.2.3