Tweak to allow the use of this Makefile with the ICC compiler.

Patch by Gregory Czajkowski <gregczajkowski@yahoo.com>.
Related to BZ #339542.

git-svn-id: svn://svn.valgrind.org/vex/trunk@2980

diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
index c07bf9be850c0253fbfac7f8a74810543b82f19a..12bf1ed1658b83d44978d673cd7a772010d6e450 100644 (file)
--- a/VEX/Makefile-gcc
+++ b/VEX/Makefile-gcc
@@ -224,11 +224,13 @@ minidist:
 # This is very uggerly.  Need to sed out both "xyzzyN" and
 # "xyzzy$N" since gcc on different targets emits the constants
 # differently -- with a leading $ on x86/amd64 but none on ppc32/64.
+# ICC also emits the constants differently with a leading # #define
 pub/libvex_guest_offsets.h:
        rm -f auxprogs/genoffsets.s
        $(CC) $(CCFLAGS) -O -S -o auxprogs/genoffsets.s \
                                auxprogs/genoffsets.c
-       grep xyzzy auxprogs/genoffsets.s | grep "^#define" \
+       grep xyzzy auxprogs/genoffsets.s | grep "^[# ]*#define" \
+          | sed "s/# #define/#define/g" \
           | sed "s/xyzzy\\$$//g" \
           | sed "s/xyzzy#//g" \
           | sed "s/xyzzy//g" \