From 25b91671f36d80dc55b7fa4419a9da853b66d51d Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Wed, 29 Oct 2014 13:53:11 +0000 Subject: [PATCH] Tweak to allow the use of this Makefile with the ICC compiler. Patch by Gregory Czajkowski . Related to BZ #339542. git-svn-id: svn://svn.valgrind.org/vex/trunk@2980 --- VEX/Makefile-gcc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc index c07bf9be85..12bf1ed165 100644 --- 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" \ -- 2.47.2