aboutsummaryrefslogtreecommitdiffstats
path: root/src/build-data/cc/gcc.txt
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-02-20 17:09:46 +0000
committerlloyd <[email protected]>2012-02-20 17:09:46 +0000
commit8c2dc1a6c3bf352a56622d569dc855ca8d6ab5e0 (patch)
tree6f50627e2e73c2b1fc1295dde8b19c4f169de46d /src/build-data/cc/gcc.txt
parent24c1546324995da70c51137ad138c3bb997a37b9 (diff)
parente943fc67962b6e4dc2c7c64707dc2cf062728520 (diff)
propagate from branch 'net.randombit.botan.tls-state-machine' (head 0ceb9cde62a2b3614901ae85a53546d9fc641326)
to branch 'net.randombit.botan.cxx11' (head 777e65950ef3706a82e5df20dcca7fcc999ca533)
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 3de85099c..4e7536e0f 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.7.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 -Weffc++ -Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast"
@@ -90,18 +88,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>