diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-03-21 23:06:42 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-03-21 23:06:42 -0700 |
| commit | 7ac885ee8cb18fc2cb974cff06190532680cf29b (patch) | |
| tree | f1a354cd2a763949a29856bac7e158d0f4f77b3b /src | |
| parent | 1e1ff638a3c920654c5f05c83b05e1e3b76e9782 (diff) | |
Repair some fallout from pcwalton's last few build changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/rustllvm/MachOObjectFile.cpp (renamed from src/llvmext/MachOObjectFile.cpp) | 0 | ||||
| -rw-r--r-- | src/rustllvm/Object.cpp (renamed from src/llvmext/Object.cpp) | 0 | ||||
| -rw-r--r-- | src/rustllvm/README (renamed from src/llvmext/README) | 0 | ||||
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp (renamed from src/llvmext/RustWrapper.cpp) | 0 | ||||
| -rw-r--r-- | src/rustllvm/include/llvm-c/Object.h (renamed from src/llvmext/include/llvm-c/Object.h) | 0 | ||||
| -rw-r--r-- | src/rustllvm/rustllvm.def (renamed from src/llvmext/rustllvm.def) | 0 |
7 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 630babf33c6..f5b3fe9b4bf 100644 --- a/src/Makefile +++ b/src/Makefile @@ -321,12 +321,12 @@ RUNTIME_HDR := rt/globals.h \ RUNTIME_INCS := -Irt/isaac -Irt/uthash RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) -SUPPORT_CS := $(addprefix llvmext/, \ +SUPPORT_CS := $(addprefix rustllvm/, \ MachOObjectFile.cpp Object.cpp RustWrapper.cpp) -SUPPORT_HDR := llvmext/include/llvm-c/Object.h +SUPPORT_HDR := rustllvm/include/llvm-c/Object.h -SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR) -iquote llvmext/include +SUPPORT_INCS := -iquote $(CFG_LLVM_INCDIR) -iquote rustllvm/include SUPPORT_OBJS := $(SUPPORT_CS:.cpp=.o) SUPPORT_LIBS := $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS) @@ -363,7 +363,7 @@ rt/%.o: rt/%.cpp $(MKFILES) @$(call CFG_ECHO, compile: $<) $(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $< -llvmext/%.o: llvmext/%.cpp $(MKFILES) +rustllvm/%.o: rustllvm/%.cpp $(MKFILES) @$(call CFG_ECHO, compile: $<) $(CFG_QUIET)$(call CFG_COMPILE_C, $@, $(CFG_LLVM_CXXFLAGS) \ $(SUPPORT_INCS)) $< diff --git a/src/llvmext/MachOObjectFile.cpp b/src/rustllvm/MachOObjectFile.cpp index 4a003249191..4a003249191 100644 --- a/src/llvmext/MachOObjectFile.cpp +++ b/src/rustllvm/MachOObjectFile.cpp diff --git a/src/llvmext/Object.cpp b/src/rustllvm/Object.cpp index 603e72b9036..603e72b9036 100644 --- a/src/llvmext/Object.cpp +++ b/src/rustllvm/Object.cpp diff --git a/src/llvmext/README b/src/rustllvm/README index 31495f22c0a..31495f22c0a 100644 --- a/src/llvmext/README +++ b/src/rustllvm/README diff --git a/src/llvmext/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index a604e4c29c5..a604e4c29c5 100644 --- a/src/llvmext/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp diff --git a/src/llvmext/include/llvm-c/Object.h b/src/rustllvm/include/llvm-c/Object.h index 1103d7dd969..1103d7dd969 100644 --- a/src/llvmext/include/llvm-c/Object.h +++ b/src/rustllvm/include/llvm-c/Object.h diff --git a/src/llvmext/rustllvm.def b/src/rustllvm/rustllvm.def index c1b521b505a..c1b521b505a 100644 --- a/src/llvmext/rustllvm.def +++ b/src/rustllvm/rustllvm.def |