1*4882a593SmuzhiyunFrom 85a3e5b4f65e5284e59dcdd90e92ea7d50ef6907 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Romain Naour <romain.naour@openwide.fr> 3*4882a593SmuzhiyunDate: Sun, 8 Feb 2015 17:23:13 +0100 4*4882a593SmuzhiyunSubject: [PATCH] erts/emulator: reorder inclued headers paths 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunIf the Perl Compatible Regular Expressions is installed on the 7*4882a593Smuzhiyunhost and the path to the headers is added to the CFLAGS, the 8*4882a593Smuzhiyunpcre.h from the host is used instead of the one provided by 9*4882a593Smuzhiyunerlang. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunErlang use an old version of this file which is incompatible 12*4882a593Smuzhiyunwith the upstream one. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunMove INCLUDES before CFLAGS to use pcre.h from erlang. 15*4882a593Smuzhiyun 16*4882a593Smuzhiyunhttp://autobuild.buildroot.net/results/cbd/cbd8b54eef535f19d7d400fd269af1b3571d6143/build-end.log 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@openwide.fr> 19*4882a593Smuzhiyun[Bernd: rebased for erlang-21.0] 20*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 21*4882a593Smuzhiyun--- 22*4882a593Smuzhiyun erts/emulator/Makefile.in | 4 ++-- 23*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in 26*4882a593Smuzhiyunindex 7145824..d079487 100644 27*4882a593Smuzhiyun--- a/erts/emulator/Makefile.in 28*4882a593Smuzhiyun+++ b/erts/emulator/Makefile.in 29*4882a593Smuzhiyun@@ -712,7 +712,7 @@ 30*4882a593Smuzhiyun # Usually the same as the default rule, but certain platforms (e.g. win32) mix 31*4882a593Smuzhiyun # different compilers 32*4882a593Smuzhiyun $(OBJDIR)/beam_emu.o: beam/beam_emu.c 33*4882a593Smuzhiyun- $(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ 34*4882a593Smuzhiyun+ $(V_EMU_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun $(OBJDIR)/beam_emu.S: beam/beam_emu.c 37*4882a593Smuzhiyun $(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ 38*4882a593Smuzhiyun@@ -765,7 +765,7 @@ 39*4882a593Smuzhiyun # General targets 40*4882a593Smuzhiyun # 41*4882a593Smuzhiyun $(OBJDIR)/%.o: beam/%.c 42*4882a593Smuzhiyun- $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ 43*4882a593Smuzhiyun+ $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun $(OBJDIR)/%.o: $(TARGET)/%.c 46*4882a593Smuzhiyun $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@ 47