treewide: Get rid of all uses of crossConfig

The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
This commit is contained in:
John Ericson
2018-05-14 23:30:37 -04:00
parent d7160f39bd
commit 330ca731e8
22 changed files with 111 additions and 138 deletions
+2 -2
View File
@@ -501,7 +501,7 @@ activatePackage() {
# the transition, we do include everything in thatcase.
#
# TODO(@Ericson2314): Don't special-case native compilation
if [[ ( -z "${crossConfig-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then
if [[ ( -z "${strictDeps-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then
addToSearchPath _PATH "$pkg/bin"
fi
@@ -551,7 +551,7 @@ _addToEnv() {
for depTargetOffset in "${allPlatOffsets[@]}"; do
(( "$depHostOffset" <= "$depTargetOffset" )) || continue
local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"
if [[ -z "${crossConfig-}" ]]; then
if [[ -z "${strictDeps-}" ]]; then
# Apply environment hooks to all packages during native
# compilation to ease the transition.
#