Martchus
97d89e925a
* Use `android-environment` instead of hardcoding paths * Remove hacks for specifying include directories and standard library manually * Streamline compiler options with what CMake would use under Android * Use C++17
34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
--- a/tools/build/src/tools/common.jam 2023-02-03 10:57:59.385098144 +0100
|
|
+++ b/tools/build/src/tools/common.jam 2023-02-03 11:00:34.982146918 +0100
|
|
@@ -1127,18 +1127,18 @@
|
|
import $(toolset) ;
|
|
local tool-version = [ $(toolset).get-full-version $(command) ] ;
|
|
|
|
- import version ;
|
|
- if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
|
- : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
|
- {
|
|
- errors.error toolset $(toolset) "initialization:"
|
|
- : version '$(version)' requested but
|
|
- '$(tool)-$(version)' not found and version
|
|
- '$(tool-version:J=.)' of default '$(command)'
|
|
- does not match
|
|
- : initialized from [ errors.nearest-user-location ]
|
|
- ;
|
|
- }
|
|
+ #import version ;
|
|
+ #if ! [ version.version-compatible [ SPLIT_BY_CHARACTERS $(version) : . ]
|
|
+ # : [ SPLIT_BY_CHARACTERS $(tool-version) : . ] ]
|
|
+ #{
|
|
+ # errors.error toolset $(toolset) "initialization:"
|
|
+ # : version '$(version)' requested but
|
|
+ # '$(tool)-$(version)' not found and version
|
|
+ # '$(tool-version:J=.)' of default '$(command)'
|
|
+ # does not match
|
|
+ # : initialized from [ errors.nearest-user-location ]
|
|
+ # ;
|
|
+ #}
|
|
}
|
|
#3) default: no command and no version specified, try using "$(tool)"
|
|
else
|