diff options
| author | lloyd <[email protected]> | 2009-11-17 07:20:51 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-17 07:20:51 +0000 |
| commit | 7a24783fd58b21e1ea59615025806663e5f231eb (patch) | |
| tree | b77c685e0b54f82890947009631461bcfe5b6880 /src/build-data | |
| parent | e00b46cf9c1dcb364ebb7d5968d6ff9dcd600c4e (diff) | |
| parent | 471847e2148776e62e4f580ade95572fc525c751 (diff) | |
propagate from branch 'net.randombit.botan' (head 0ac5a29496b4e50775827d9655c064f6d1c98813)
to branch 'net.randombit.botan.c++0x' (head 3232da044d41756582b53da9d14c3ac07e9b2916)
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/cc/gcc.txt | 14 | ||||
| -rw-r--r-- | src/build-data/cc/icc.txt | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 3cb287f70..0b1668908 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -1,8 +1,6 @@ macro_name "GCC" -binary_name "g++" - -compiler_has_tr1 yes +binary_name "g++-4.5-20091112" compile_option "-c " output_to_option "-o " @@ -10,7 +8,7 @@ add_include_dir_option "-I" add_lib_dir_option "-L" add_lib_option "-l" -lang_flags "-D_REENTRANT -ansi -Wno-long-long" +lang_flags "-ansi -Wno-long-long -std=c++0x" warning_flags "-W -Wall" #warning_flags "-Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter" @@ -72,6 +70,8 @@ ppc64 -> "-mcpu=SUBMODEL" ppc # Note that the 'linking' bit means "use this for both compiling *and* linking" <mach_abi_linking> +all -> "-pthread" + amd64 -> "-m64" mips64 -> "-mabi=64" s390 -> "-m31" @@ -80,10 +80,6 @@ sparc32 -> "-m32 -mno-app-regs" sparc64 -> "-m64 -mno-app-regs" ppc64 -> "-m64" -# This should probably be used on most/all targets, but the docs are incomplete -openbsd -> "-pthread" -freebsd -> "-pthread" -dragonfly -> "-pthread" -netbsd -> "-pthread -D_NETBSD_SOURCE" +netbsd -> "-D_NETBSD_SOURCE" qnx -> "-fexceptions -D_QNX_SOURCE" </mach_abi_linking> diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt index b5cad542c..7187cae56 100644 --- a/src/build-data/cc/icc.txt +++ b/src/build-data/cc/icc.txt @@ -2,8 +2,6 @@ macro_name "INTEL" binary_name "icpc" -compiler_has_tr1 yes - compile_option "-c " output_to_option "-o " add_include_dir_option "-I" |