diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-12-05 10:40:11 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-12-05 10:40:11 +0000 |
| commit | ce31ac1c9afdad67108ffcca27854b70b61aea8c (patch) | |
| tree | df2595b6a0a7ae837404431c2e289e1faf6e3259 /Makefile | |
| parent | 508b24f20fcebe0be3d3b3171edb53309f6b09f9 (diff) | |
Revert r196490 and fix include paths in makefile-based build
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@196492 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -249,10 +249,10 @@ $(call Set,Tmp.CFLAGS,$(strip \ $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.s $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir $(Summary) " ASSEMBLE: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<" - $(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c -o $$@ $$< + $(Verb) $(Tmp.CC) $(COMMON_ASMFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$< $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.S $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir $(Summary) " ASSEMBLE: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<" - $(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c -o $$@ $$< + $(Verb) $(Tmp.CC) $(COMMON_ASMFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$< $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.c $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir $(Summary) " COMPILE: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<" $(Verb) $(Tmp.CC) $(COMMON_CFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$< |