anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not try to build an empty boost lib

Browse Source 
This should fix a build failure on OS X:
Making all in boost
  AR       liblyxboost.a
  ar: no archive members specified
This commit is contained in:
Georg Baum 2016-06-11 09:28:11 +02:00
parent cf1e08f7f7
commit d67a8cb212
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/Makefile.am vendored
View File

@ -3,8 +3,11 @@ include $(top_srcdir)/config/common.am
DIST_SUBDIRS = boost hunspell libiconv zlib DIST_SUBDIRS = boost hunspell libiconv zlib
if USE_INCLUDED_BOOST if USE_INCLUDED_BOOST
if LYX_USE_STD_REGEX
else
BOOST = boost BOOST = boost
endif endif
endif
if USE_INCLUDED_HUNSPELL if USE_INCLUDED_HUNSPELL
HUNSPELL = hunspell HUNSPELL = hunspell

5
3rdparty/boost/Makefile.am vendored
View File

@ -12,10 +12,6 @@ EXTRA_DIST = boost \
AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>" AM_CPPFLAGS += -DBOOST_USER_CONFIG="<config.h>"
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
if LYX_USE_STD_REGEX
else
# This version is more than three times faster than the one below # This version is more than three times faster than the one below
if MONOLITHIC_BOOST if MONOLITHIC_BOOST
@ -48,4 +44,3 @@ liblyxboost_a_SOURCES = \
endif #MONOLITHIC_BOOST endif #MONOLITHIC_BOOST
endif #LYX_USE_STD_REGEX