[tor-commits] [tor-browser-bundle/master] Bug 21954: Ignore dump_syms_regtest.o when building libwebrtc

gk at torproject.org gk at torproject.org
Sat Apr 15 19:30:34 UTC 2017


commit e9b16e19134655aa16a8840e09093e01692138d5
Author: Arlo Breault <arlolra at gmail.com>
Date:   Sat Apr 15 08:29:53 2017 -0400

    Bug 21954: Ignore dump_syms_regtest.o when building libwebrtc
    
    This was mistakenly removed in 121de1ca (see bug 21748).
---
 gitian/descriptors/linux/gitian-webrtc.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml
index 0622fee..ccf2d4a 100644
--- a/gitian/descriptors/linux/gitian-webrtc.yml
+++ b/gitian/descriptors/linux/gitian-webrtc.yml
@@ -121,7 +121,8 @@ script: |
   "$GN" gen out/Release --args="$GN_ARGS"
   ninja -C out/Release webrtc field_trial metrics_default pc_test_utils
   # https://github.com/keroserene/go-webrtc/issues/23#issuecomment-175312648
-  ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' | sort)
+  # libwebrtc-linux-386-magic.a(dump_syms_regtest.o): unsupported ELF file type 2
+  ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' -not -name 'dump_syms_regtest.o' | sort)
   cd ../..
 
   # Grabbing the result



More information about the tor-commits mailing list