Changeset 27410


Ignore:
Timestamp:
11/21/22 19:27:10 (2 years ago)
Author:
jdquinn
Message:

CHG: Do not include i386 directory as well when searching for libgcc on macOS

Location:
issm/trunk-jpl/externalpackages
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh

    r27408 r27410  
    1919LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    2020LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    21 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
     21LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    2222
    2323## Environment

  • issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh

    r27408 r27410  
    3535LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    3636LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    37 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
     37LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    3838
    3939# Cleanup

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r27408 r27410  
    1717LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    1818LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
    19 LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
     19LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    2020
    2121GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake)
Note: See TracChangeset for help on using the changeset viewer.