summaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-05-30 01:07:04 -0700
committerAnand Avati <avati@redhat.com>2014-06-04 16:24:32 -0700
commitea58f256463efb07824dbd307af06f2c3960f254 (patch)
tree2de22ec3ce5e2d065ec32b07f89ca9cc679eca45 /build-aux
parent1f95e55cc633e9b082b4eb37a6a825c0e33ac5c8 (diff)
build: Avoid gcc pragmas when clang is enabled
Change-Id: I86544a9bfd24ef1a69315c0f6c3abcdd9aeb2c69 BUG: 1089172 Signed-off-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-on: http://review.gluster.org/7932 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/xdrgen4
1 files changed, 3 insertions, 1 deletions
diff --git a/build-aux/xdrgen b/build-aux/xdrgen
index c6dd5cc..a2240a2 100755
--- a/build-aux/xdrgen
+++ b/build-aux/xdrgen
@@ -22,10 +22,12 @@ append_licence_header ()
#if defined(__GNUC__)
#if __GNUC__ >= 4
+#if !defined(__clang__)
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#endif
+#endif
EOF
@@ -67,7 +69,7 @@ gen_headers ()
rm -f $hfile;
rpcgen -h -o $hfile $xfile;
# the '#ifdef' part of file should be fixed
- sed -e 's/-/_/g' $hfile > ${hfile}.new && mv ${hfile}.new $hfile;
+ sed -e 's/-/_/g' $hfile > ${hfile}.new && mv ${hfile}.new $hfile;
# Gen header to temp file and append generated file
append_licence_header $hfile $tmp_hfile;
# now move the destination file to actual original file