Skip to content
This repository has been archived by the owner on Sep 29, 2022. It is now read-only.

Commit

Permalink
Fix multiple glibc versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mingwandroid committed Jun 3, 2017
1 parent 2efb442 commit be34ee8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cross-compilers/compilers_generic/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if [[ ! -n $(find ${SRC_DIR}/gcc_built -iname ${cpu_arch}-${vendor}-*-gfortran)
source ${RECIPE_DIR}/write_ctng_config

yes "" | ct-ng ${ctng_sample}
write_ctng_config_before "${PWD}"/.config
write_ctng_config_before .config
# Apply some adjustments for conda.
sed -i.bak "s|# CT_DISABLE_MULTILIB_LIB_OSDIRNAMES is not set|CT_DISABLE_MULTILIB_LIB_OSDIRNAMES=y|g" .config
sed -i.bak "s|CT_CC_GCC_USE_LTO=n|CT_CC_GCC_USE_LTO=y|g" .config
Expand All @@ -71,8 +71,10 @@ if [[ ! -n $(find ${SRC_DIR}/gcc_built -iname ${cpu_arch}-${vendor}-*-gfortran)
fi
# Now ensure any changes we made above pull in other requirements by running oldconfig.
yes "" | ct-ng oldconfig
# Remove all CT_LIBC_GLIBC lines as otherwise we can end up with conflicting values in different vars.
sed -i.bak "/CT_LIBC_GLIBC/d" .config
# And undo any damage to version numbers => the seds above could be moved into this too probably.
write_ctng_config_after "${PWD}"/.config
write_ctng_config_after .config
if cat .config | grep "CT_GDB_NATIVE=y"; then
if ! cat .config | grep "CT_EXPAT_TARGET=y"; then
echo "ERROR: CT_GDB_NATIVE=y but CT_EXPAT_TARGET!=y"
Expand Down

0 comments on commit be34ee8

Please sign in to comment.