Skip to content

Commit

Permalink
Add CXX for mingw building.
Browse files Browse the repository at this point in the history
[skip travis]
  • Loading branch information
grafikrobot committed Nov 16, 2018
1 parent 6603253 commit a699fd9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# subject to the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#
# Copyright Rene Rivera 2015-2017.
# Copyright Rene Rivera 2015-2018.

branches:
only:
Expand All @@ -11,7 +11,6 @@ branches:
- /feature\/.*/

environment:
TEST_ALL_EXTRAS:
matrix:
- TOOLSET: msvc
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Expand Down
10 changes: 5 additions & 5 deletions src/engine/config_toolset.bat
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ set "_known_=1"
goto :eof

:Config_GCC
set "BOOST_JAM_CXX=gcc -pedantic -fno-strict-aliasing -s -O3"
set "BOOST_JAM_CXX=gcc -x c++ -std=c++11 -s -O3"
set "BOOST_JAM_OPT_JAM=-o b2.exe"
set "_known_=1"
goto :eof

:Config_GCC_NOCYGWIN
set "BOOST_JAM_CXX=gcc -pedantic -fno-strict-aliasing -s -O3 -mno-cygwin"
set "BOOST_JAM_CXX=gcc -x c++ -std=c++11 -s -O3 -mno-cygwin"
set "BOOST_JAM_OPT_JAM=-o b2.exe"
set "_known_=1"
goto :eof
Expand All @@ -160,10 +160,10 @@ set "_known_=1"
goto :eof

:Config_MINGW
if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%"
if not "_%CXX%_" == "__" (
set "CXX=gcc"
)
set "BOOST_JAM_CXX=gcc -pedantic -fno-strict-aliasing -s -O3"
set "BOOST_JAM_CXX=%CXX% -x c++ -std=c++11 -s -O3"
set "BOOST_JAM_OPT_JAM=-o b2.exe"
set "_known_=1"
goto :eof

0 comments on commit a699fd9

Please sign in to comment.