Verified Commit 5bf0fbf0 authored by Bernd Paysan's avatar Bernd Paysan
Browse files

check libtool improved

parent de96858e

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ before_install: ./install-deps.sh 
script:

  - ./autogen.sh

  - export CC=gcc

  - if [ "${TRAVIS_OS_NAME}" = osx ]; then gcc -v; gcc-9 -v; export CC=gcc-9; fi

  - if [ "${TRAVIS_OS_NAME}" = osx ]; then gcc -v; gcc-9 -v; export CC=gcc-9; export PATH="/usr/local/opt/texinfo/bin:/Library/TeX/texbin:$PATH"; fi

  - ./configure --enable-lib CC="$CC $M32"

  - make

  - for i in misc r8c 8086 c165; do ./build-ec $i; done

INSTALL.md

+3 −2
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ 


    git clone https://git.savannah.gnu.org/git/gforth.git

    cd gforth

    ./install-deps.sh # install all known dependencies for a full build

    . ./install-deps.sh # install all known dependencies for a full build

    ./BUILD-FROM-SCRATCH

    sudo make install



## Additional info for MacOS ##



You'll get brew installed if it is not already there.

You'll get brew and XCode command line tools installed (git will trigger the

latter) if it is not already there.  The install-deps.sh



## Alternative: Build from Tarball

If you are building from the tarball, please consult [INSTALL](INSTALL).

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -1130,9 +1130,9 @@ fi 
AC_SUBST(LIB_SUFFIX)

AC_CHECK_LIB(rt,clock_gettime)



if test -n "GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then

if test -n "$GNU_LIBTOOL" -a "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then

  build_libcc_named=build-libcc-named

elif test -n "GNU_LIBTOOL" -a $ac_cv_func_dlopen = yes; then

elif test -n "$GNU_LIBTOOL" -a "x$ac_cv_func_dlopen" = xyes; then

  build_libcc_named=build-libcc-named

else

  AC_MSG_WARN([No LIBTOOL found, skip pre-building libcc-based libraries])

install-deps.sh

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ install_osx() { 
  brew cask install xquartz mactex

  export PATH="/Library/TeX/texbin:$PATH"

  brew link --overwrite gcc

  export CC=gcc-9

#  (cd /usr/local/Cellar/gcc/8.2.0/lib/gcc/8/gcc/x86_64-apple-darwin17.7.0/8.2.0/include-fixed && mv stdio.h stdio.h.botched)

}