Making scons aware of local flags

4 files changed, 111 insertions, 20 deletions

diff --git a/net-p2p/adchpp/ChangeLog b/net-p2p/adchpp/ChangeLog
index 4ea0f93..291a21b 100644
--- a/net-p2p/adchpp/ChangeLog
+++ b/net-p2p/adchpp/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*adchpp-2.8.1-r3 (17 Sep 2012)
+
+  17 Sep 2012; Francisco Blas Izquierdo Riera (klondike)
+  -adchpp-2.8.1-r2.ebuild, +adchpp-2.8.1-r3.ebuild,
+  +files/adchpp-2.8.1-fix_cflags.patch:
+  Making scons aware of local flags
+
 *adchpp-2.8.1-r2 (19 Aug 2012)
 
   19 Aug 2012; Francisco Blas Izquierdo Riera (klondike)
diff --git a/net-p2p/adchpp/Manifest b/net-p2p/adchpp/Manifest
index f3dbc16..87e5b94 100644
--- a/net-p2p/adchpp/Manifest
+++ b/net-p2p/adchpp/Manifest
@@ -1,19 +1,20 @@
-AUX adchpp-2.8.0-allow_set_optional_features.patch 2538 RMD160 3b35c45625c9c7345c19ae33b9cb7a5f881e9905 SHA1 ff628fefdc93d4c664bff50cb23404472f2eb061 SHA256 ebd442a2584fe508ad46bd07527888fc6f5f398b4651a4552bc701e05f2ed043
-AUX adchpp-2.8.0-fix_config_paths.patch 4034 RMD160 389076dccf2f350bc3978d2ac38ce7eec761b2e6 SHA1 e2e396e0542df153a312c0b43275a321511d0209 SHA256 7a112f77e3d995a102703b85230610643f69cd4f99b35fcb22c3edc7c5e7a85b
-AUX adchpp-2.8.0-fix_doc_includes.patch 1668 RMD160 6f56712768289c082b5ca26cf85603533c945c18 SHA1 614cacd73b4a5a1b58161688e76e0ad749b1ba40 SHA256 fe421b91ad69b1a8eee9c793ebc75b62aab61db8d8f418d1ba81ec2c1d25e068
-AUX adchpp-2.8.0-fix_guide_paths.patch 687 RMD160 37340a5d6c04ddec175f9da6bddedc6ea61c7a94 SHA1 892e5ab367ba6dbeaa344556df14072705529c38 SHA256 35ae569de9a6fadb44fad07b659391527627f9dc1911a8495f8ff11a8b036da2
-AUX adchpp-2.8.0-fix_python.patch 584 RMD160 4529ce6ad883a2179243faf090e270d0937ebd89 SHA1 c3fe4d4abca47dbb95af7f60055d3780ef05df9d SHA256 022dee2338a596451987e0696abaa7c65a81b02a4e01062aeff0c0f1a401cf11
-AUX adchpp-2.8.0-fix_ruby.patch 1937 RMD160 ac9f6f09b96105ea4b6a2837cf843515907a4261 SHA1 defc6f2f4f936aab412135536f1a333fb7bbf607 SHA256 e0a2ec075af4394950de69fd64d9eeeae662723832157abefc561f9c17fd9b90
-AUX adchpp-2.8.1-fix_disconnect_signal.patch 3044 RMD160 01eab10b4738f79a5bfacf4aef289fedf32e5dde SHA1 6486b768650b57341e49744ff483becf2d674499 SHA256 c8626cf2fe33e119266a54ee44634e22bc76a4fe316e6f1df7352b123c3c62f0
-AUX adchpp-2.8.1-fix_disconnects.patch 1269 RMD160 0ef8a8b66c1d21e348d6252b8e2fbcd402237aa8 SHA1 35f91c8c460bed3ff0ac6013534504be50ff485b SHA256 25a1aa11763b7e1666691740ada31989fa485a62068c9901909dccb29792b42c
-AUX adchpp-2.8.1-fix_python.patch 712 RMD160 9244a6a2fabd7aa869583635e710c0639fb89f8b SHA1 7a521ac4b2dd658a4f4471b7b51519601b8d3452 SHA256 844d58c65e4629c7406eca60147fe8c56bc5f70b5e3f56a2538695dc30a36a5d
-AUX adchpp.conf.d 310 RMD160 3e8c898256490130b59ac6bf04e79e204448a483 SHA1 84bab09886f43651a884b51ffc2bf26e59d94e05 SHA256 15955fc380ae76be3b235cb2d87cb55d7e356ff23a1bde47defc06b686e1ec57
-AUX adchpp.init.d 466 RMD160 a5fb587e8016c1b6730ee139b41bb297ccce5013 SHA1 ec502cb70204e31cfb48bfd0af9183f0c5a5698c SHA256 7ec336d63857aca5f10d2c94b4b59cdc713aa4bebe2c71d8505fe0ed1668aa27
-AUX adchpp_runner.sh 185 RMD160 72c35fba3ea4425c7ebda2baee69c2d649220721 SHA1 15426ba4ae2f12d4ad3c912f4925157ff3a31966 SHA256 3fc062bea86aa313c20315a293c0164bf52fe272c0e46d0e2753cc29b5ca89cb
-DIST adchpp_2.8.0_source.tar.gz 8446076 RMD160 058b73713c6f593a9dca30393272bd43be9de461 SHA1 277d84017d3d911d1449d3245db5bf0fcb7ed63e SHA256 7819f18f4fbd5a17f1e06ca9aa66f6c1a31d59cab7b0e600940283aa0e6307c2
-DIST adchpp_2.8.1_source.tar.gz 8551219 RMD160 c269283efcd2853f12d31db6f52c0c7b5165676a SHA1 2892c41e9c0922f61f9ae424b2ea48e6565bb8b6 SHA256 666e68056d6e4fc1f59ed2822eed914af293fa708fb943a046b40b4ba294a4f3
-EBUILD adchpp-2.8.0.ebuild 4099 RMD160 ba84a93d3caac2400d2d1f0d8f7267fac9158471 SHA1 1b45bf06e2843eba5f49413260c2025a21ab2b44 SHA256 c1115000de26fb362a30d5b7de5fa72fb58e09eb0d8898e2e2856f1f704fe917
-EBUILD adchpp-2.8.1-r2.ebuild 4036 RMD160 9d371980a2037405944789bbac3aa68caecf1ac9 SHA1 bcc0fc1b7720109dbece5a5c7a6ecbd6022d3847 SHA256 5a040a344054b2000c0b2aa857a73f31451b212402d8a9679f043bb4cf2d57fa
-MISC ChangeLog 1316 RMD160 253d3a9ac012e857353385925c26bbe6a55b70ed SHA1 0b92ad364cb3140ad6b427ce2c3473935fdc8984 SHA256 5514e0c671e6a14e97b6fd8bc3a15a35ce3aeaec1580891be439c6dc1dbb0db0
-MISC TODO 112 RMD160 ddf91c86b1dbc3e00393e25046fcb6c734cee754 SHA1 bc896d708667823c5b86d12c5e65fab769a521ea SHA256 4d3a6f431d988c8ac37e6bbdb8fc946ddc591cce2029a83a339e0b16e4954d4c
-MISC metadata.xml 407 RMD160 025a9c56902d342189f308d98ed986fb5fba2ac1 SHA1 d4faaafc9dc058d10e7fb3c3ae75c6d526b2f39f SHA256 f5001e99b6181be8bac1b3ba8dbbce6ff2d63084ea64816cbb16d53a6871738b
+AUX adchpp-2.8.0-allow_set_optional_features.patch 2538 SHA256 ebd442a2584fe508ad46bd07527888fc6f5f398b4651a4552bc701e05f2ed043 SHA512 1b95cfc745a361d0f1a61d48f55927c15e12518e822d63f1c17098034442b82ebac01f0506f47bb22cb06c8dd3f00f9c90d5d9caae0495d2ff4e5ede6778ec3b WHIRLPOOL 8bcf9d20cb98dc61a850abe75f29d9b0967faac418a8ad73ca4c328852fae8585558e590841070d09b2cb5410081f2b68860e0e8b8d8fc2b0b6a62d0a95638a7
+AUX adchpp-2.8.0-fix_config_paths.patch 4034 SHA256 7a112f77e3d995a102703b85230610643f69cd4f99b35fcb22c3edc7c5e7a85b SHA512 02f7cff3a78d5dfc3025dc3ba6ab9afdf249af8db2e92083f2155f15774c39b5c04660f8215973c5060e42ba4e498ca6f90b33f3ad8d46d8241e4d244be80895 WHIRLPOOL bcdd543345eafa624494410771f299e3c794d423655e19220974700ce6b322bd99e723d8d94c7410a4769aa214c3b74e61bc91ed2ecd49d285f1a7d67ad39fb5
+AUX adchpp-2.8.0-fix_doc_includes.patch 1668 SHA256 fe421b91ad69b1a8eee9c793ebc75b62aab61db8d8f418d1ba81ec2c1d25e068 SHA512 49399bb64131ddedc090214d0e4dcd675db0527e74218c099073f99756ac17e8b5d735e4b36bd13406b77f580832015ab6daa06ff4e7d7e98564393cd6612dc1 WHIRLPOOL 34ff64398284948d31709263cb929f2d53c6beb256aefc5405743a95b86cb1a97804c7c6183e6e18eba8cdaac4afa3afe64a2bdc76610fe51847230635f5fcc7
+AUX adchpp-2.8.0-fix_guide_paths.patch 687 SHA256 35ae569de9a6fadb44fad07b659391527627f9dc1911a8495f8ff11a8b036da2 SHA512 921232c7682603638dae7e52ca839b195d2e88cd6fed02e188251bd1de5e50e31ec02d96193526d63a4a27b07ffa1228500a7fe8c01e6febc36c8489b88e613d WHIRLPOOL 2fada6a45b04d57e08610bdc90e7d9c8d8d115641218b8ac5c97478709eb2678d56189d8a50271cb489f31a49132fa9e2a0dc46f9c4cfdccd40fd09b2901cdfb
+AUX adchpp-2.8.0-fix_python.patch 584 SHA256 022dee2338a596451987e0696abaa7c65a81b02a4e01062aeff0c0f1a401cf11 SHA512 0dd2387d07be77262bc591a74016586a64459fb40b1603fba67158f76cba46d155a79b022a986b90c4080485b361bcdf95e77e6e2552b11c17980cef79c9f9a0 WHIRLPOOL e85606944e440fe1970af0c92473cde53792d518c569309240734219ff975b81a0647b503eaa85916075b3f2c5ea27c4fa6d382a78e2190629ca27cd2cae3f32
+AUX adchpp-2.8.0-fix_ruby.patch 1937 SHA256 e0a2ec075af4394950de69fd64d9eeeae662723832157abefc561f9c17fd9b90 SHA512 4206be60eebc1769815bd5168ed905789548fd904c5e734907c5c8ddaec7c705d179857960851558cb3c5a493e8302a2588429d2574c1a96f4891d12b7b23b9c WHIRLPOOL 738783435f920ec9552061feece880c056eee14ce988d8733b5c9080be0777c061db040380112c4fefa3c99fc5a017b5d662de96f8eaaab59f4d65f7fddb40eb
+AUX adchpp-2.8.1-fix_cflags.patch 2304 SHA256 0059806e433a3cfe68031b9e36ad83c61e9b8dc1a46e7d883ff62963b0d7112d SHA512 9b37bd1ed81c1dc0823ae4c4598867a5851e46e72eedfd502cdd15c626b60bd033d646111db6b9391d5e82df255c040e8fdff4629e7cafeaf26d66a5678b9f48 WHIRLPOOL c5f7222ef83b98d6bb8867bb889f0e7037948f131710577213b84fd3c624da7e8de429691b4cedc5967c225dcd23bd9a001375d59d225f1d378686b9712d97ee
+AUX adchpp-2.8.1-fix_disconnect_signal.patch 3044 SHA256 c8626cf2fe33e119266a54ee44634e22bc76a4fe316e6f1df7352b123c3c62f0 SHA512 3a3977019a178ef5a3dca9f5e17f0d1412d1ac6d89f99b8d710ef912ed1ae5a873ce34de934fda3fb2eb20693e327bd257f3a050e999f3ec510145f3874b4c56 WHIRLPOOL b366f25f23c59f85b6df5074457f1d03259a3ab639cdf9753f5db13d1bdb21196c53fc31812f304efac74c22bc8fe18866c97713c93cba8b8aecd0cea253ae60
+AUX adchpp-2.8.1-fix_disconnects.patch 1269 SHA256 25a1aa11763b7e1666691740ada31989fa485a62068c9901909dccb29792b42c SHA512 dd9fc8f0c0929c7023aa33bab66a6cf2133084fa0203026ea5cda5da51bdcc123cee0ed691e716e0c96c86e67e67bccdac359f53715b10ccadb3138fa8a5f6c5 WHIRLPOOL 0ea42176c3227c86380b1d1df92af536690efef8e59f370735e8a124bae3053a282cb7ec42083d70d450462df39fb1b24cbe9ec7eba55df4b755cd1c8ac63e8d
+AUX adchpp-2.8.1-fix_python.patch 712 SHA256 844d58c65e4629c7406eca60147fe8c56bc5f70b5e3f56a2538695dc30a36a5d SHA512 ae3eb9e358af57172ab5a754be8e80cc9ed85c62d0354c21840f1af18dcddac38d84aa426854ce32d21e733cbb069f641e080b4e5db9137a334ef48f2c22f124 WHIRLPOOL 7b1eee8d19aff1ff2ab64a0eb92c12224ee2e9773ced37c28c03f3b6542a72df67075aa310fcd0160556363d1608dcfe3c2222fc7c088ec9ee62e550f5055191
+AUX adchpp.conf.d 310 SHA256 15955fc380ae76be3b235cb2d87cb55d7e356ff23a1bde47defc06b686e1ec57 SHA512 6a31e68bef59fca8841c88b83ca6f49a3012552921435d04c8c76cb4c7e9b044aa5ebac00ad97f751cb993860f6dd0c449c1d5a5b8a91f4cd7a814fd26813b6d WHIRLPOOL 8ff4e1975e4f8a6d28cababf379776eb57f1cf9b9f1477a423c6a9535956396ae9fec834a6ad79152920da0fcb3050193b26def1153c4da92a5d533d53e5e5e7
+AUX adchpp.init.d 466 SHA256 7ec336d63857aca5f10d2c94b4b59cdc713aa4bebe2c71d8505fe0ed1668aa27 SHA512 cef32c96fc13a4112dd02d50f02441356bb982d1b2eb35a5c990942bf3ad9e305e7d7fb1037122d865b11d1091ad57884f685afaa2a3c8f41ee55ac142a1bc85 WHIRLPOOL c6af02f4d56acd821315513bc597d1bc2a9f0c940a5ff56c50cdc796d952f511ebcb2d0d3bde1b1078f773b1768f3fc502b09265f5ee6fa1865a7e915ec35e23
+AUX adchpp_runner.sh 185 SHA256 3fc062bea86aa313c20315a293c0164bf52fe272c0e46d0e2753cc29b5ca89cb SHA512 60eb17ed3c3d2244bbdf77e00a413a97da82cb2045e0761c7e86951ce31b7e8de7d3470fd420a0f2b09f0f0f46ab1125f49a1f289bc8cfcf49a7436fb79f1e3c WHIRLPOOL 04b60a57145ac8a8bb835a7bd2b23293fa913c78dbdcb93c070b8590188ee930a1cc4a8fe766cba21c50d42d680db359e0d4a051dd1ac7c9b84466b3db7c2503
+DIST adchpp_2.8.0_source.tar.gz 8446076 SHA256 7819f18f4fbd5a17f1e06ca9aa66f6c1a31d59cab7b0e600940283aa0e6307c2 SHA512 e8b35a1cbbf641004788b0647f70a0b9b59d7eafcf8b7bef6b5157c5331b703ff30e9dfe8fe2d7097b2a3afbce40e4cdd0655e9fc8d6192702030e2e19c8025b WHIRLPOOL 429af354c8355a91b23b5e9ccba853a5aebb53a5d9d9acd0006adf543483e0145061543c4027f0dfa6b5983d0669dc4f4f20a552a3eb52f10df339c5e4fdec26
+DIST adchpp_2.8.1_source.tar.gz 8551219 SHA256 666e68056d6e4fc1f59ed2822eed914af293fa708fb943a046b40b4ba294a4f3 SHA512 b2c9a8c5a7cc1648f63690ea23c81d0d5ee0a555cd0e3ee2b5b302b195be6fafeb32d520758da124ff0b0f74e3fd12093456004a493e7547afa57ab01250089e WHIRLPOOL d09836ce0a8fcafb4f22775a74401f95864d05b7964e2b1c2fd5966005c93db8806e56c8f7eb11c2e6d7885989a44d6f1c7762ffa68a852b3f6af6211c131dfd
+EBUILD adchpp-2.8.0.ebuild 4099 SHA256 c1115000de26fb362a30d5b7de5fa72fb58e09eb0d8898e2e2856f1f704fe917 SHA512 1c5c8ea7debd93bed566fbdc9f19c5edde99267d71434ccb2c540f486257efcb1beea536a204e47e4a80006fffcb116619932ffad92669c8535d6786ed3cef1a WHIRLPOOL 79fb246ddfa6b3d9d7939d73b2801927ab1fb8b0418347bdffddd62d5e888369461811d85c32f2a476d0a25e33c76697f7d27385541e4fca8a936b84660672ca
+EBUILD adchpp-2.8.1-r3.ebuild 4174 SHA256 ff097f091651ded4edc3786575ef74a395f87a851ee01f3a35961fec73e0958d SHA512 a63b815ece9fc0f4cdfde0c8d66ee78494c2b96e80b0a44ca8334a89d6f3395a9712200e4156a66dd696fc72d7690015a5f360dccbaca2a89d2079e8b9d4312d WHIRLPOOL 0fc82c8720afa63fe1cbed8dbcc23319dd79f8ed0f626c7df0d39d99e58219431b81e6228f662b33c00f2ce86ca7e659a168387c58072eb17ee42746df1a32da
+MISC ChangeLog 1534 SHA256 cd6be196a1b7b8c7c7aab057eb8de9a99035459bfebe8190d05453cccb1b53fb SHA512 bab3e9d4f74613cf664048f5e5fcc60a8784654d94a99aa9ac97707de11190bf3f496f12ea3332d342d20c91c07c104e711fb6017b00bfa17b9915bd6a779f91 WHIRLPOOL bfc3be449eecfab246b0c69cf9fbc7bf0d7a1748fcc7908864e6e94f10fd2ff95f4e134b1fc1954a5cc71b25f097adfba4d3b4d5cb7f41959c9c2302e788416d
+MISC TODO 112 SHA256 4d3a6f431d988c8ac37e6bbdb8fc946ddc591cce2029a83a339e0b16e4954d4c SHA512 297523e8d11393dc37db2616561e027cd39191cfbdc5b0fe5cc95b3b8f038e90b491ad10feb256506fad996e5b427990a6aa479976524cf22f873588705bbbb6 WHIRLPOOL 5f06b3cd7e94f6d5f905be92ab915f71763b009572d69b63de0e92411fb97591696bf4bb67913a1acc8b72291add029f4ccc6fe76cf3d640766e78caf056412d
+MISC metadata.xml 407 SHA256 f5001e99b6181be8bac1b3ba8dbbce6ff2d63084ea64816cbb16d53a6871738b SHA512 2d89602c893366202dd7bb25928869e85febc1bda1e3e1a6547149aa84a38eae542629356de26dede7d72eae1d0262a06edd50b963fb02c403f60164a393eea1 WHIRLPOOL 32509c63bbafb3c1b5e6c9c75cfa2fbcc47afeaa6903d266c8f8d167e5895f7c44c8759647c6f073630f56c5a12fdb14ea3c8742df9639ae8bd4dfa5c43f6cbf
diff --git a/net-p2p/adchpp/adchpp-2.8.1-r2.ebuild b/net-p2p/adchpp/adchpp-2.8.1-r3.ebuild
index 4aa20f5..7620db2 100644
--- a/net-p2p/adchpp/adchpp-2.8.1-r2.ebuild
+++ b/net-p2p/adchpp/adchpp-2.8.1-r3.ebuild
@@ -70,7 +70,6 @@ src_configure() {
 	use script && myplugins=$myplugins,Script
 
 	myesconsargs=(
-#		CC="$(tc-getCC)"
 		plugins=$myplugins
 		langs=$mylangs
 		mode=$tmode
@@ -88,6 +87,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.8.1-fix_python.patch"
 	epatch "${FILESDIR}/${PN}-2.8.1-fix_disconnect_signal.patch"
 	epatch "${FILESDIR}/${PN}-2.8.1-fix_disconnects.patch"
+	epatch "${FILESDIR}/${PN}-2.8.1-fix_cflags.patch"
 	sed -e "s:%%ADCHPPLIB%%:$libpath:g" \
 		"${FILESDIR}/adchpp_runner.sh" > adchpp_runner.sh
 	sed -e "s:%%ADCHPPLIB%%:$libpath:g" \
@@ -99,6 +99,10 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export CC CXX
+	export LINKFLAGS="${LDFLAGS}"
+	export CCFLAGS="${CFLAGS}"
+	export CCFLAGS="${CXXFLAGS}"
 	escons || die
 }
 
diff --git a/net-p2p/adchpp/files/adchpp-2.8.1-fix_cflags.patch b/net-p2p/adchpp/files/adchpp-2.8.1-fix_cflags.patch
new file mode 100644
index 0000000..7e80cf9
--- /dev/null
+++ b/net-p2p/adchpp/files/adchpp-2.8.1-fix_cflags.patch
@@ -0,0 +1,79 @@
+Sólo en adchpp_2.8.1_source: .sconsign.dblite
+diff -ur adchpp_2.8.1_source.orig//SConstruct adchpp_2.8.1_source/SConstruct
+--- adchpp_2.8.1_source.orig//SConstruct	2012-09-17 09:30:08.016122458 +0200
++++ adchpp_2.8.1_source/SConstruct	2012-09-17 10:27:40.237129827 +0200
+@@ -6,9 +6,9 @@
+ from build_util import Dev
+ 
+ gcc_flags = {
+-	'common': ['-g', '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-missing-field-initializers', '-fexceptions'],
++	'common': ['-fexceptions'],
+ 	'debug': [], 
+-	'release' : ['-O3']
++	'release' : []
+ }
+ 
+ gcc_xxflags = {
+@@ -42,7 +42,7 @@
+ }
+ 
+ gcc_link_flags = {
+-	'common' : ['-g', '-Wl,--no-undefined', '-time'],
++	'common' : ['-Wl,--no-undefined', '-time'],
+ 	'debug' : [],
+ 	'release' : []				
+ }
+@@ -73,6 +73,22 @@
+ langs = ['lua', 'python', 'ruby']
+ 
+ defEnv = Environment(ENV = os.environ)
++
++if 'CC' in os.environ:
++	defEnv.Replace(CC = os.environ['CC'])
++
++if 'CXX' in os.environ:
++	defEnv.Replace(CXX = os.environ['CXX'])
++
++if 'CCFLAGS' in os.environ:
++	defEnv.Replace(CCFLAGS = os.environ['CCFLAGS'].split())
++
++if 'CXXFLAGS' in os.environ:
++	defEnv.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split())
++
++if 'LINKFLAGS' in os.environ:
++	defEnv.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split())
++
+ opts = Variables('custom.py', ARGUMENTS)
+ 
+ if sys.platform == 'win32':
+@@ -107,6 +123,21 @@
+ 
+ env = Environment(ENV = os.environ, tools = [defEnv['tools'], 'swig'], toolpath = ['tools'], options = opts, TARGET_ARCH = TARGET_ARCH, MSVS_ARCH = TARGET_ARCH)
+ 
++if 'CC' in os.environ:
++	env.Replace(CC = os.environ['CC'])
++
++if 'CXX' in os.environ:
++	env.Replace(CXX = os.environ['CXX'])
++
++if 'CCFLAGS' in os.environ:
++	env.Replace(CCFLAGS = os.environ['CCFLAGS'].split())
++
++if 'CXXFLAGS' in os.environ:
++	env.Replace(CXXFLAGS = os.environ['CXXFLAGS'].split())
++
++if 'LINKFLAGS' in os.environ:
++	env.Replace(CXXFLAGS = os.environ['LINKFLAGS'].split())
++
+ # filter out boost from dependencies to get a speedier rebuild scan
+ # this means that if boost changes, scons -c needs to be run
+ # delete .sconsign.dblite to see the effects of this if you're upgrading
+@@ -139,8 +170,6 @@
+ 
+ 	if env['savetemps']:
+ 		env.Append(CCFLAGS = ['-save-temps', '-fverbose-asm'])
+-	else:
+-		env.Append(CCFLAGS = ['-pipe'])
+ 
+ if env['CC'] == 'cl': # MSVC
+ 	flags = msvc_flags