Changeset 3058


Ignore:
Timestamp:
Nov 9, 2013 10:21:42 AM (6 years ago)
Author:
stefan
Message:

merge r3045 and r3052 from trunk

Location:
stable/0.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r3050 r3058  
    371371    fi ;;
    372372  * )
    373     CYGPATH_W=echo
     373    if test x"$CYGPATH_W" = x ; then
     374      CYGPATH_W=echo
     375    fi
    374376    ;;
    375377esac
     
    587589        ;;
    588590      *)
    589         CXXLIBS="-lstdc++ -lm" # -lgcc"
     591        # clang uses libc++ as the default standard C++ library, not libstdc++
     592        # this test is supposed to recognize whether the compiler is clang
     593        #
     594        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ciso646>]], [[
     595#ifndef _LIBCPP_VERSION
     596       choke me
     597#endif
     598          ]])],
     599          [CXXLIBS="-lc++"],
     600          [CXXLIBS="-lstdc++ -lm"])
    590601        ;;
    591602    esac
     
    758769    fi ;;
    759770  * )
    760     CYGPATH_W=echo
     771    if test x"$CYGPATH_W" = x ; then
     772      CYGPATH_W=echo
     773    fi
    761774    ;;
    762775esac
Note: See TracChangeset for help on using the changeset viewer.