diff options
| author | Michael Sullivan <sully@msully.net> | 2012-06-13 15:07:19 -0700 |
|---|---|---|
| committer | Michael Sullivan <sully@msully.net> | 2012-06-13 16:39:09 -0700 |
| commit | f8afe107fa7a677dc611dd39532570ddaab3bfab (patch) | |
| tree | 5efe3f777114eef5e7147994f89a9bba65f7488d | |
| parent | e5a5fc20290e70752af73860b1a192b33588624f (diff) | |
| download | rust-f8afe107fa7a677dc611dd39532570ddaab3bfab.tar.gz rust-f8afe107fa7a677dc611dd39532570ddaab3bfab.zip | |
Minor makefile cleanup.
| -rw-r--r-- | mk/rt.mk | 7 | ||||
| -rw-r--r-- | mk/rustllvm.mk | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index af991f747b9..cd382267301 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -142,9 +142,10 @@ rt/$(1)/$(CFG_RUNTIME): $$(RUNTIME_OBJS_$(1)) $$(MKFILE_DEPS) \ $$(CFG_GCCISH_POST_LIB_FLAGS) $$(RUNTIME_LIBS_$(1)) \ $$(CFG_LIBUV_LINK_FLAGS),$$(RUNTIME_DEF_$(1)),$$(CFG_RUNTIME)) -# FIXME: For some reason libuv's makefiles can't figure out the correct definition -# of CC on the mingw I'm using, so we are explicitly using gcc. Also, we -# have to list environment variables first on windows... mysterious +# FIXME: For some reason libuv's makefiles can't figure out the +# correct definition of CC on the mingw I'm using, so we are +# explicitly using gcc. Also, we have to list environment variables +# first on windows... mysterious ifdef CFG_ENABLE_FAST_MAKE LIBUV_DEPS := $$(S)/.gitmodules diff --git a/mk/rustllvm.mk b/mk/rustllvm.mk index 8453f7b9468..fea09dae5af 100644 --- a/mk/rustllvm.mk +++ b/mk/rustllvm.mk @@ -14,11 +14,6 @@ endif RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp) -# Behind an ifdef for now since this requires a patched LLVM. -ifdef CFG_STACK_GROWTH -RUSTLLVM_OBJS_CS_$(1) += rustllvm/RustPrologHook.cpp -endif - RUSTLLVM_DEF_$(1) := rustllvm/rustllvm$$(CFG_DEF_SUFFIX) RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \ |