summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2015-02-07 13:03:01 +0100
committerPeter Wu <peter@lekensteyn.nl>2015-02-07 13:03:01 +0100
commit2580dc7701cc4350990b5d5ad3ef11e4e75bb4e5 (patch)
tree54f2b461d554f0d30ae749b5d2a974cb4628a7f4
parent818f97811ee7d9b4c5b2d0d14f8044e88787bc01 (diff)
downloadwireshark-notes-2580dc7701cc4350990b5d5ad3ef11e4e75bb4e5.tar.gz
sync-build.sh: more color, only ignore top-level config.h
There is packaging/macosx/native-gtk/config.h
-rwxr-xr-xsync-build.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/sync-build.sh b/sync-build.sh
index ea9943e..9ad6585 100755
--- a/sync-build.sh
+++ b/sync-build.sh
@@ -46,8 +46,9 @@ CXX=${CXX:-c++}
# For clang, `-O1` (or `-g`?) seems necessary to get something other than
# "<optimized out>".
# -O1 -g -gdwarf-4 -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer
-CFLAGS=${CFLAGS:--fsanitize=address -fsanitize=undefined}
-CXXFLAGS=${CFLAGS:--fsanitize=address -fsanitize=undefined}
+_default_flags='-fsanitize=address -fsanitize=undefined -fdiagnostics-color=auto'
+CFLAGS=${CFLAGS:-$_default_flags}
+CXXFLAGS=${CFLAGS:-$_default_flags}
LIBDIR=/usr/lib
# Run with `B32=1 ./sync-build.sh` to build for multilib
@@ -139,8 +140,8 @@ while inotifywait -qq -e close_write "$sync"; do
# IMPORTANT: do not sync top-level config.h or it will break OOT builds
rsync -av --delete --exclude='.*.sw?' \
- --exclude=config.h \
- --exclude=compile_commands.json \
+ --exclude=/config.h \
+ --exclude=/compile_commands.json \
--exclude=\*.tar\* \
"$localsrcdir/" "$remotehost:$remotesrcdir/" &&
ssh -t "$remotehost" "$remotecmd"