diff --git a/README.md b/README.md index fd907774..d8446d9d 100644 --- a/README.md +++ b/README.md @@ -139,8 +139,8 @@ Package license: BSD-3-Clause Summary: GNU C++ Compiler (activation scripts) -About binutils_linux-s390x --------------------------- +About binutils_linux-aarch64 +---------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -148,8 +148,8 @@ Package license: BSD-3-Clause Summary: The GNU Binutils are a collection of binary tools (activation scripts) -About gcc_bootstrap_linux-s390x -------------------------------- +About gcc_bootstrap_linux-aarch64 +--------------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -157,8 +157,8 @@ Package license: GPL Summary: GCC bootstrap compilers for building deps -About gcc_linux-s390x ---------------------- +About gcc_linux-aarch64 +----------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -166,8 +166,8 @@ Package license: BSD-3-Clause Summary: GNU C Compiler (activation scripts) -About gfortran_linux-s390x --------------------------- +About gfortran_linux-aarch64 +---------------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock @@ -175,8 +175,8 @@ Package license: BSD-3-Clause Summary: GNU Fortran Compiler (activation scripts) -About gxx_linux-s390x ---------------------- +About gxx_linux-aarch64 +----------------------- Home: https://github.com/conda-forge/ctng-compiler-activation-feedstock diff --git a/recipe/activate-gcc.sh b/recipe/activate-gcc.sh index 02794d2e..b7726ec6 100644 --- a/recipe/activate-gcc.sh +++ b/recipe/activate-gcc.sh @@ -142,7 +142,7 @@ _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_RANLIB=${CONDA_PREFIX}/bin/@CHOST@-ranlib -D _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_LINKER=${CONDA_PREFIX}/bin/@CHOST@-ld -DCMAKE_STRIP=${CONDA_PREFIX}/bin/@CHOST@-strip" _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release" -_MESON_ARGS="--buildtype release" +_MESON_ARGS="-Dbuildtype=release" if [ "${CONDA_BUILD:-0}" = "1" ]; then _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"