aboutsummaryrefslogtreecommitdiffstats
path: root/src/build-data/cc/gcc.txt
diff options
context:
space:
mode:
authorlloyd <[email protected]>2011-10-06 15:54:03 +0000
committerlloyd <[email protected]>2011-10-06 15:54:03 +0000
commit7939e91a733c8c50706de2fb090fcb60f7f229c8 (patch)
treebd9f24eefbae7a49e4832ac728ea83c80da99dc4 /src/build-data/cc/gcc.txt
parentca5581260445e70ed4d038091acb88949b6101ce (diff)
parent2877bbc0828a92de94d3628455e92c4298a2ac7d (diff)
propagate from branch 'net.randombit.botan' (head 29dfb73a5efec220ebafcb9c1d7a32bb9d63461c)
to branch 'net.randombit.botan.cxx11' (head a842d86b2b9593318fbce5868c3d1278f8b3a037)
Diffstat (limited to 'src/build-data/cc/gcc.txt')
-rw-r--r--src/build-data/cc/gcc.txt18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 23da2a972..c7e4a3c14 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++
-
-has_tr1 yes
+binary_name g++-4.6.0
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 -Wno-long-long"
+lang_flags "-D_REENTRANT -std=c++0x"
warning_flags "-W -Wall"
maintainer_warning_flags "-Werror -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast"
@@ -81,18 +79,16 @@ x86_64 -> "-march=SUBMODEL -momit-leaf-frame-pointer"
# The 'linking' bit means "use this for both compiling *and* linking"
<mach_abi_linking>
-x86_64 -> "-m64"
+all -> "-pthread"
+
mips64 -> "-mabi=64"
s390 -> "-m31"
s390x -> "-m64"
sparc32 -> "-m32 -mno-app-regs"
sparc64 -> "-m64 -mno-app-regs"
ppc64 -> "-m64"
+x86_64 -> "-m64"
-# This should probably be used on most/all targets, but the docs are unclear
-openbsd -> "-pthread"
-freebsd -> "-pthread"
-dragonfly -> "-pthread"
-netbsd -> "-pthread -D_NETBSD_SOURCE"
-qnx -> "-fexceptions -D_QNX_SOURCE"
+netbsd -> "-D_NETBSD_SOURCE"
+qnx -> "-fexceptions -D_QNX_SOURCE"
</mach_abi_linking>