diff options
| author | Alexander Potapenko <glider@google.com> | 2013-03-29 09:41:10 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2013-03-29 09:41:10 +0000 |
| commit | 389b45061f2a41ccbcf51cff043d4ac16c2d30a3 (patch) | |
| tree | 5914a0b91519cc9e7fcfe42e7ffceeaa50a75586 | |
| parent | c20a08d25bc02de9ac2c4f85694e680d1b86c67f (diff) | |
| download | bcm5719-llvm-389b45061f2a41ccbcf51cff043d4ac16c2d30a3.tar.gz bcm5719-llvm-389b45061f2a41ccbcf51cff043d4ac16c2d30a3.zip | |
[libsanitizer] Put COMMON_CFLAGS/COMMON_CXXFLAGS before Tmp.CFLAGS to let the config-specific flags override common flags.
llvm-svn: 178339
| -rw-r--r-- | compiler-rt/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile index 63b05367b12..6747ea4d431 100644 --- a/compiler-rt/Makefile +++ b/compiler-rt/Makefile @@ -255,10 +255,10 @@ $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.S $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir $(Verb) $(Tmp.CC) $(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) $(Tmp.CFLAGS) -c $(COMMON_CFLAGS) -o $$@ $$< + $(Verb) $(Tmp.CC) $(COMMON_CFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$< $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.cc $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir $(Summary) " COMPILE: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<" - $(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c $(COMMON_CXXFLAGS) -o $$@ $$< + $(Verb) $(Tmp.CC) $(COMMON_CXXFLAGS) $(Tmp.CFLAGS) -c -o $$@ $$< .PRECIOUS: $(Tmp.ObjPath)/.dir endef |
