more fortran fixes

conda-archive · Jun 3, 2017 · 7b76034 · 7b76034
1 parent e4452c6
commit 7b76034
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/cross-compilers/compilers_generic/install-gcc.sh b/cross-compilers/compilers_generic/install-gcc.sh
@@ -17,12 +17,12 @@ pushd ${SRC_DIR}/.build/${CHOST}/build/build-cc-gcc-final/
   make -C ${CHOST}/libgcc prefix=${PREFIX} install
   # rm ${PREFIX}/lib/libgcc_s.so*
 
-  mkdir -p $PREFIX/$CHOST/sysroot/lib
+  # mkdir -p $PREFIX/$CHOST/sysroot/lib
 
-  cp ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libgomp.so* $PREFIX/$CHOST/sysroot/lib
-  if [ -e ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libquadmath.so* ]; then
-    cp ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libquadmath.so* $PREFIX/$CHOST/sysroot/lib
-  fi
+  # cp ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libgomp.so* $PREFIX/$CHOST/sysroot/lib
+  # if [ -e ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libquadmath.so* ]; then
+  #   cp ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libquadmath.so* $PREFIX/$CHOST/sysroot/lib
+  # fi
 
   make prefix=${PREFIX} install-libcc1
   install -d ${PREFIX}/share/gdb/auto-load/usr/lib

diff --git a/cross-compilers/compilers_generic/install-libgfortran.sh b/cross-compilers/compilers_generic/install-libgfortran.sh
@@ -9,11 +9,7 @@ export PATH=${SRC_DIR}/gcc_built/bin:${SRC_DIR}/.build/${CHOST}/buildtools/bin:$
 mkdir -p $PREFIX/lib
 rm -f $PREFIX/lib/libgfortran* || true
 
-cp ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libgfortran.so.3.0.0 $PREFIX/lib
-pushd $PREFIX/lib
-  ln -s libgfortran.so.3.0.0 libgfortran.so.3.0
-  ln -s libgfortran.so.3.0 libgfortran.so
-popd
+cp -f ${SRC_DIR}/gcc_built/$CHOST/sysroot/lib/libgfortran.so* $PREFIX/lib
 
 # Install Runtime Library Exception
 install -Dm644 $SRC_DIR/.build/src/gcc-${PKG_VERSION}/COPYING.RUNTIME \