diff --git a/gcc/newlib/build.sh b/gcc/newlib/build.sh index 8a047fc..556ae3d 100644 --- a/gcc/newlib/build.sh +++ b/gcc/newlib/build.sh @@ -125,7 +125,7 @@ cd build-gcc $SRC_DIR/gcc/configure \ \ --prefix=$PREFIX \ - --program-prefix=$TARGET-newlib- \ + --program-prefix=$TARGET- \ \ --with-gmp=$CONDA_PREFIX \ --with-mpfr=$CONDA_PREFIX \ @@ -170,7 +170,6 @@ ls -l $PREFIX/bin/$TARGET-newlib-* cd .. $PREFIX/bin/$TARGET-gcc --version -$PREFIX/bin/${TOOLCHAIN_ARCH}-unknown-elf-gcc --version $PREFIX/bin/$TARGET-newlib-gcc --version echo $($PREFIX/bin/$TARGET-newlib-gcc --version 2>&1 | head -1 | sed -e"s/$TARGET-gcc (GCC) //") diff --git a/gcc/newlib/meta.yaml b/gcc/newlib/meta.yaml index 7e8ea89..fbe5f97 100644 --- a/gcc/newlib/meta.yaml +++ b/gcc/newlib/meta.yaml @@ -30,6 +30,9 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - make + # Arch specific + - binutils-{{ environ.get('TOOLCHAIN_ARCH') }}-elf + - gcc-{{ environ.get('TOOLCHAIN_ARCH') }}-elf-nostdc {{ version }}.* host: # These are taken from the output of the configure scripts - gmp >=4.3.2 @@ -37,12 +40,8 @@ requirements: - mpc >=0.8.1 - isl >=0.15.0 - cloog - # Arch specific - - binutils-{{ environ.get('TOOLCHAIN_ARCH') }}-elf - - gcc-{{ environ.get('TOOLCHAIN_ARCH') }}-elf-nostdc {{ version }}.* run: - binutils-{{ environ.get('TOOLCHAIN_ARCH') }}-elf - - gcc-{{ environ.get('TOOLCHAIN_ARCH') }}-elf-nostdc {{ version }}.* about: home: https://gcc.gnu.org/ diff --git a/gcc/newlib/run_test.sh b/gcc/newlib/run_test.sh index 564ae55..f9420ea 100644 --- a/gcc/newlib/run_test.sh +++ b/gcc/newlib/run_test.sh @@ -6,8 +6,8 @@ set +x set +e TARGET=${TOOLCHAIN_ARCH}-elf -GCC=$TARGET-newlib-gcc -GXX=$TARGET-newlib-g++ +GCC=$TARGET-gcc +GXX=$TARGET-g++ OBJDUMP=$TARGET-objdump case "${TOOLCHAIN_ARCH}" in