Skip to content

Commit

Permalink
dolt: support nacl and silent-rules on fallback
Browse files Browse the repository at this point in the history
nacl doesn't use pic as does mingw.

Signed-off-by: Rafaël Carré <[email protected]>
  • Loading branch information
lu-zero authored and funman committed Sep 10, 2012
1 parent 9b2ae59 commit be75acd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions m4/dolt.m4
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ case $host in
i?86-apple-darwin*)
pic_options='-fno-common'
;;
*mingw*)
*mingw*|*nacl*)
pic_options=''
;;
*)
Expand All @@ -38,8 +38,9 @@ i?86-apple-darwin*)
esac
if test x$dolt_supported = xno ; then
AC_MSG_RESULT([no, falling back to libtool])
LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
LTCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
LTCXXCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
m4_pattern_allow([AM_V_lt])
else
AC_MSG_RESULT([yes, replacing libtool])
Expand Down

0 comments on commit be75acd

Please sign in to comment.