Skip to content

Commit

Permalink
Move away from setting HOST in ctng-activation scripts
Browse files Browse the repository at this point in the history 
Define new CONDA_TOOLCHAIN_HOST variable that is set the
way HOST was previously set.

HOST is now set only when CONDA_BUILD or CONDA_ACTIVATION_SET_HOST
is set to 1

fixes AnacondaRecipes#151
  • Loading branch information
@timsnyder
timsnyder committed Sep 14, 2019
1 parent 04b0c4d commit e3e8a03
Show file tree
Hide file tree
Showing 25 changed files with 284 additions and 44 deletions.
4 changes: 2 additions & 2 deletions conda_build_config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ ctng_gcc_build_number:
- 2
# keep zip_keys in mind - these are coupled with a specific gcc version in the ctng_gcc above
ctng_gcc_activation_build_num:
- 8
- 4
- 9
- 5

ctng_gmp:
- 6.1.2
Expand Down
14 changes: 12 additions & 2 deletions ctng-compilers-activation-feedstock/recipe/activate-binutils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -97,7 +106,8 @@ fi

_tc_activation \
activate host @CHOST@ @CHOST@- \
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
14 changes: 12 additions & 2 deletions ctng-compilers-activation-feedstock/recipe/activate-g++.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -102,7 +111,8 @@ _tc_activation \
activate host @CHOST@ @CHOST@- \
c++ g++ \
"CXXFLAGS,${CXXFLAGS:-${CXXFLAGS_USED}}" \
"DEBUG_CXXFLAGS,${DEBUG_CXXFLAGS:-${DEBUG_CXXFLAGS_USED}}"
"DEBUG_CXXFLAGS,${DEBUG_CXXFLAGS:-${DEBUG_CXXFLAGS_USED}}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
14 changes: 12 additions & 2 deletions ctng-compilers-activation-feedstock/recipe/activate-gcc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -145,7 +154,8 @@ _tc_activation \
"DEBUG_CPPFLAGS,${DEBUG_CPPFLAGS:-${DEBUG_CPPFLAGS_USED}}" \
"DEBUG_CFLAGS,${DEBUG_CFLAGS:-${DEBUG_CFLAGS_USED}}" \
"CMAKE_PREFIX_PATH,${CMAKE_PREFIX_PATH:-${CMAKE_PREFIX_PATH_USED}}" \
"_CONDA_PYTHON_SYSCONFIGDATA_NAME,${_CONDA_PYTHON_SYSCONFIGDATA_NAME_USED}"
"_CONDA_PYTHON_SYSCONFIGDATA_NAME,${_CONDA_PYTHON_SYSCONFIGDATA_NAME_USED}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
12 changes: 11 additions & 1 deletion ctng-compilers-activation-feedstock/recipe/activate-gfortran.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -103,6 +112,7 @@ _tc_activation \
"FORTRANFLAGS,${FORTRANFLAGS:-${FFLAGS_USED}}" \
"DEBUG_FFLAGS,${FFLAGS:-${FFLAGS_USED} @DEBUG_FFLAGS@}" \
"DEBUG_FORTRANFLAGS,${FORTRANFLAGS:-${FFLAGS_USED} @DEBUG_FFLAGS@}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

# extra ones - have a dependency on the previous ones, so done after.
_tc_activation \
Expand Down
14 changes: 12 additions & 2 deletions ctng-compilers-activation-feedstock/recipe/deactivate-binutils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -97,7 +106,8 @@ fi

_tc_activation \
deactivate host @CHOST@ @CHOST@- \
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
14 changes: 12 additions & 2 deletions ctng-compilers-activation-feedstock/recipe/deactivate-g++.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -102,7 +111,8 @@ _tc_activation \
deactivate host @CHOST@ @CHOST@- \
c++ g++ \
"CXXFLAGS,${CXXFLAGS:-${CXXFLAGS_USED}}" \
"DEBUG_CXXFLAGS,${DEBUG_CXXFLAGS:-${DEBUG_CXXFLAGS_USED}}"
"DEBUG_CXXFLAGS,${DEBUG_CXXFLAGS:-${DEBUG_CXXFLAGS_USED}}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
14 changes: 12 additions & 2 deletions ctng-compilers-activation-feedstock/recipe/deactivate-gcc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -114,7 +123,8 @@ _tc_activation \
"DEBUG_CPPFLAGS,${DEBUG_CPPFLAGS:-${DEBUG_CPPFLAGS_USED}}" \
"DEBUG_CFLAGS,${DEBUG_CFLAGS:-${DEBUG_CFLAGS_USED}}" \
"CMAKE_PREFIX_PATH,${CMAKE_PREFIX_PATH:-${CMAKE_PREFIX_PATH_USED}}" \
"_CONDA_PYTHON_SYSCONFIGDATA_NAME,${_CONDA_PYTHON_SYSCONFIGDATA_NAME_USED}"
"_CONDA_PYTHON_SYSCONFIGDATA_NAME,${_CONDA_PYTHON_SYSCONFIGDATA_NAME_USED}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
12 changes: 11 additions & 1 deletion ctng-compilers-activation-feedstock/recipe/deactivate-gfortran.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -103,6 +112,7 @@ _tc_activation \
"FORTRANFLAGS,${FORTRANFLAGS:-${FFLAGS_USED}}" \
"DEBUG_FFLAGS,${FFLAGS:-${FFLAGS_USED} @DEBUG_FFLAGS@}" \
"DEBUG_FORTRANFLAGS,${FORTRANFLAGS:-${FFLAGS_USED} @DEBUG_FFLAGS@}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

# extra ones - have a dependency on the previous ones, so done after.
_tc_activation \
Expand Down
14 changes: 12 additions & 2 deletions ctng-dbg-compilers-activation-feedstock/recipe/activate-binutils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -97,7 +106,8 @@ fi

_tc_activation \
activate host @CHOST@ @CHOST@- \
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
14 changes: 12 additions & 2 deletions ctng-dbg-compilers-activation-feedstock/recipe/activate-g++.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -102,7 +111,8 @@ _tc_activation \
activate host @CHOST@ @CHOST@- \
c++ g++ \
"CXXFLAGS,${CXXFLAGS:-${DEBUG_CXXFLAGS_USED}}" \
"OPT_CXXFLAGS,${OPT_CXXFLAGS:-${CXXFLAGS_USED}}"
"OPT_CXXFLAGS,${OPT_CXXFLAGS:-${CXXFLAGS_USED}}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
14 changes: 12 additions & 2 deletions ctng-dbg-compilers-activation-feedstock/recipe/activate-gcc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -139,7 +148,8 @@ _tc_activation \
"LDFLAGS,${LDFLAGS:-${LDFLAGS_USED}}" \
"OPT_CPPFLAGS,${CPPFLAGS:-${CPPFLAGS_USED}}" \
"OPT_CFLAGS,${CFLAGS:-${CFLAGS_USED}}" \
"_CONDA_PYTHON_SYSCONFIGDATA_NAME,${_CONDA_PYTHON_SYSCONFIGDATA_NAME_USED}"
"_CONDA_PYTHON_SYSCONFIGDATA_NAME,${_CONDA_PYTHON_SYSCONFIGDATA_NAME_USED}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
12 changes: 11 additions & 1 deletion ctng-dbg-compilers-activation-feedstock/recipe/activate-gfortran.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -103,6 +112,7 @@ _tc_activation \
"FORTRANFLAGS,${FFLAGS:-${FFLAGS_USED} @DEBUG_FFLAGS@}" \
"OPT_FFLAGS,${FFLAGS:-${FFLAGS_USED}}" \
"OPT_FORTRANFLAGS,${FFLAGS:-${FFLAGS_USED}}" \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

# extra ones - have a dependency on the previous ones, so done after.
_tc_activation \
Expand Down
14 changes: 12 additions & 2 deletions ctng-dbg-compilers-activation-feedstock/recipe/deactivate-binutils.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,17 @@ function _tc_activation() {
to=""
fi

work=("$@")

if [ "${CONDA_BUILD}" = "1" ]; then
CONDA_ACTIVATION_SET_HOST=1
fi
if [ "${CONDA_ACTIVATION_SET_HOST}" = "1" ]; then
work+=("${tc_nature},${tc_machine}")
fi

for pass in check apply; do
for thing in $tc_nature,$tc_machine "$@"; do
for thing in "${work[@]}"; do
case "${thing}" in
*,*)
newval=$(echo "${thing}" | sed "s,^[^\,]*\,\(.*\),\1,")
Expand Down Expand Up @@ -97,7 +106,8 @@ fi

_tc_activation \
deactivate host @CHOST@ @CHOST@- \
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip
addr2line ar as c++filt elfedit gprof ld ${GOLD_USED} nm objcopy objdump ranlib readelf size strings strip \
"CONDA_TOOLCHAIN_HOST,@CHOST@"

if [ $? -ne 0 ]; then
echo "ERROR: $(_get_sourced_filename) failed, see above for details"
Expand Down
Loading

0 comments on commit e3e8a03

Please sign in to comment.