Skip to content

Commit

Permalink
Remove need to define YY syms in build scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
grafikrobot committed Apr 1, 2019
1 parent 79a686d commit eb92f67
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 11 deletions.
12 changes: 3 additions & 9 deletions src/engine/build.sh
Expand Up @@ -429,14 +429,8 @@ case $B2_OS in
;;
esac

B2_CXXFLAGS="\
-DNDEBUG \
-DYYSTACKSIZE=5000 \
-DYYINITDEPTH=5000 \
-o b2"
if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG} ${B2_CXXFLAGS}"
else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} ${B2_CXXFLAGS}"
if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}"
else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG"
fi
B2_CXXFLAGS="${CXXFLAGS} ${B2_CXXFLAGS}"
echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES}
echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2
echo_run cp b2 bjam
2 changes: 0 additions & 2 deletions src/engine/config_toolset.bat
Expand Up @@ -20,8 +20,6 @@ if "_%BOOST_JAM_TOOLSET%_" == "_intel-win32_" call :Config_INTEL_WIN32
if "_%BOOST_JAM_TOOLSET%_" == "_mingw_" call :Config_MINGW
set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DNT"
set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DNDEBUG"
set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DYYSTACKSIZE=5000"
set "BOOST_JAM_OPT_JAM=%BOOST_JAM_OPT_JAM% -DYYINITDEPTH=5000"
exit /b %errorlevel%

:Call_If_Exists
Expand Down
1 change: 1 addition & 0 deletions src/engine/jamgram.c
Expand Up @@ -73,6 +73,7 @@
#include "object.h"
#include "rules.h"

# define YYINITDEPTH 5000 /* for C++ parsing */
# define YYMAXDEPTH 10000 /* for OSF and other less endowed yaccs */

# define F0 -1
Expand Down
1 change: 1 addition & 0 deletions src/engine/jamgram.y
Expand Up @@ -105,6 +105,7 @@
#include "object.h"
#include "rules.h"

# define YYINITDEPTH 5000 /* for C++ parsing */
# define YYMAXDEPTH 10000 /* for OSF and other less endowed yaccs */

# define F0 -1
Expand Down
1 change: 1 addition & 0 deletions src/engine/jamgram.yy
Expand Up @@ -59,6 +59,7 @@
#include "object.h"
#include "rules.h"

# define YYINITDEPTH 5000 /* for C++ parsing */
# define YYMAXDEPTH 10000 /* for OSF and other less endowed yaccs */

# define F0 -1
Expand Down

0 comments on commit eb92f67

Please sign in to comment.