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

Commit be34ee8

Browse files
committed
Fix multiple glibc versions
1 parent 2efb442 commit be34ee8

File tree

1 file changed

+4
-2
lines changed
  • cross-compilers/compilers_generic

1 file changed

+4
-2
lines changed

cross-compilers/compilers_generic/build.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if [[ ! -n $(find ${SRC_DIR}/gcc_built -iname ${cpu_arch}-${vendor}-*-gfortran)
5353
source ${RECIPE_DIR}/write_ctng_config
5454

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

0 commit comments

Comments
 (0)