diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-20 07:32:49 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-20 07:32:49 +0000 |
| commit | ca4866290b2408c39575f4cea40f2bac16183631 (patch) | |
| tree | b9124ade26368017fb7e46b4bb7d26467d66740c /Jamrules.jam | |
| parent | 487a18107f7a054b3bab9db02c6db0fc8e6729da (diff) | |
tests: Fixed deprecation warnings disabling for GCC 4.0, miscellaneous fixes for MacOS X
git-svn-id: http://pugixml.googlecode.com/svn/trunk@433 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'Jamrules.jam')
| -rw-r--r-- | Jamrules.jam | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Jamrules.jam b/Jamrules.jam index 4907b7e..7cd9abc 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -1,8 +1,8 @@ # Rules for Jamfile.jam -if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) ) +if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) { - if ( $(toolset:I^=gcc) ) + if ( $(toolset:I=^gcc) ) { GCCPATH = "" ; } @@ -13,12 +13,6 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) ) CCFLAGS += -D$(defines) ; - if ( $(toolset:I=^mingw3) ) - { - # GCC3 does not have pragma diagnostic - CCFLAGS += -Wno-deprecated-declarations ; - } - if ( $(configuration) = "debug" ) { CCFLAGS += -D_DEBUG ; @@ -33,6 +27,11 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) ) CCFLAGS += -fno-exceptions ; } + if ( $(toolset:I=^mingw) ) + { + LDFLAGS += -static-libgcc -static ; + } + actions ObjectAction { "$(GCCPATH)gcc" -W -Wall -Wextra -Werror -pedantic -c $(>) -o $(<) $(CCFLAGS) @@ -40,12 +39,12 @@ if ( $(toolset:I=^mingw) || $(toolset:I^=gcc) ) actions LibraryAction { - "$(GCCPATH)ar" rc $(<) $(>) + "$(GCCPATH)ar" rcs $(<) $(>) } actions LinkAction { - "$(GCCPATH)g++" $(>) -o $(<) -static-libgcc -static $(LDFLAGS) + "$(GCCPATH)g++" $(>) -o $(<) $(LDFLAGS) } actions maxtargets 1 CoverageAction |