diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-12-21 11:36:14 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-12-21 11:36:14 +0100 |
| commit | e85348e74e0fe8b107eead773c768361b12b7e2f (patch) | |
| tree | c78d083b38c6a4b0349121b3e1d53a3ee30970fd /sync-build.sh | |
| parent | 24d70d2119636a6ac69c250dcc9877bb9c7ddadd (diff) | |
| download | wireshark-notes-e85348e74e0fe8b107eead773c768361b12b7e2f.tar.gz | |
notes,sync-build.sh: notes for MPX, build adjustments
Append to PATH to avoid clobbering it when putting ccache in $PATH.
Enable SBC codec for testing.
Enable debug-prefix-map, should make relocatable debug builds easier
(where I build in a different directory and move it).
Diffstat (limited to 'sync-build.sh')
| -rwxr-xr-x | sync-build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sync-build.sh b/sync-build.sh index b25bb9a..221c0f0 100755 --- a/sync-build.sh +++ b/sync-build.sh @@ -54,8 +54,9 @@ _default_flags+=\ -fsanitize=undefined _default_flags+=\ -fdiagnostics-color _default_flags+=\ -fuse-ld=gold # Supported in GCC since 2007 (?), but only in Clang 3.8 -#_default_flags+=" -fdebug-prefix-map=$builddir=" -#_default_flags+=" -fdebug-prefix-map=$remotesrcdir=" +# In GDB, use "dir /tmp/wireshark" to add the source directory anyway. +_default_flags+=" -fdebug-prefix-map=$builddir=" +_default_flags+=" -fdebug-prefix-map=$remotesrcdir=" CFLAGS="${CFLAGS-$_default_flags -fno-common}${EXTRA_CFLAGS:+ $EXTRA_CFLAGS}" # Default to use the same CXXFLAGS as CFLAGS (common case) CXXFLAGS="${CXXFLAGS-$CFLAGS}" @@ -111,7 +112,7 @@ remotecmd="mysh() { schroot -c chroot:arch -- sh \"\$@\"; fi }; mysh -c ' -PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl; +PATH=\$PATH:/usr/bin/core_perl; if $force_cmake || [ ! -e $builddir/CMakeCache.txt ]; then mkdir -p $builddir && cd $builddir && set -x && @@ -128,7 +129,7 @@ if $force_cmake || [ ! -e $builddir/CMakeCache.txt ]; then -DENABLE_QT5=1 \ -DENABLE_GEOIP=1 \ -DENABLE_KERBEROS=1 \ - -DENABLE_SBC=0 \ + -DENABLE_SBC=1 \ -DENABLE_SMI=0 \ -DENABLE_GNUTLS=1 \ -DENABLE_GCRYPT=1 \ |