|
From: <sv...@va...> - 2014-10-29 13:53:20
|
Author: florian
Date: Wed Oct 29 13:53:11 2014
New Revision: 2980
Log:
Tweak to allow the use of this Makefile with the ICC compiler.
Patch by Gregory Czajkowski <gre...@ya...>.
Related to BZ #339542.
Modified:
trunk/Makefile-gcc
Modified: trunk/Makefile-gcc
==============================================================================
--- trunk/Makefile-gcc (original)
+++ trunk/Makefile-gcc Wed Oct 29 13:53:11 2014
@@ -224,11 +224,13 @@
# 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" \
|