Skip to content

Commit

Permalink
Toolchain: Remove binutils and make
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Mar 29, 2019
1 parent 659abba commit 80b9306
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 159 deletions.
2 changes: 1 addition & 1 deletion tools/toolchain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# build toolchain
WORKDIR /opt/cp2k-toolchain
COPY . /opt/cp2k-toolchain
RUN ./install_cp2k_toolchain.sh --install-all --with-binutils=system --with-cmake=system --with-make=system \
RUN ./install_cp2k_toolchain.sh --install-all --with-cmake=system \
&& rm -rf ./build

# configure shell
Expand Down
14 changes: 1 addition & 13 deletions tools/toolchain/install_cp2k_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,6 @@ The --with-PKG options follow the rules:
--with-gcc The GCC compiler to use to compile CP2K
Default = system
--with-binutils GNU binutils
Default = system
--with-make GNU make
Default = system
--with-cmake Cmake utilities, required for building ParMETIS
Default = no
--with-valgrind Valgrind memory debugging tool, only used for
Expand Down Expand Up @@ -261,7 +257,7 @@ EOF
# PACKAGE LIST: register all new dependent tools and libs here. Order
# is important, the first in the list gets installed first
# ------------------------------------------------------------------------
tool_list="binutils lcov valgrind make cmake gcc"
tool_list="lcov valgrind cmake gcc"
mpi_list="mpich openmpi"
math_list="mkl acml openblas reflapack"
lib_list="fftw libint libxc libsmm libxsmm scalapack elpa \
Expand All @@ -279,9 +275,7 @@ done
# ------------------------------------------------------------------------

# tools to turn on by default:
with_binutils=__SYSTEM__
with_gcc=__SYSTEM__
with_make=__SYSTEM__

# libs to turn on by default, the math and mpi libraries are chosen by there respective modes:
with_fftw=__INSTALL__
Expand Down Expand Up @@ -500,12 +494,6 @@ while [ $# -ge 1 ] ; do
--with-gcc*)
with_gcc=$(read_with $1)
;;
--with-binutils*)
with_binutils=$(read_with $1)
;;
--with-make*)
with_make=$(read_with $1)
;;
--with-cmake*)
with_cmake=$(read_with $1)
;;
Expand Down
75 changes: 0 additions & 75 deletions tools/toolchain/scripts/install_binutils.sh

This file was deleted.

70 changes: 0 additions & 70 deletions tools/toolchain/scripts/install_make.sh

This file was deleted.

0 comments on commit 80b9306

Please sign in to comment.