Skip to content

Commit

Permalink
Fixed makefile to point to the new llvm build directory.
Browse files Browse the repository at this point in the history
  • Loading branch information
@vadimcn
vadimcn committed Sep 6, 2013
1 parent 992b558 commit d4ebe83
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/rustllvm.mk
View file
Expand Up @@ -19,7 +19,7 @@ define DEF_RUSTLLVM_TARGETS
# llvm, but using it straight out of the build directory)
ifdef CFG_WINDOWSY_$(1)
LLVM_EXTRA_INCDIRS_$(1)= -iquote $(S)src/llvm/include \
-iquote llvm/$(1)/include
-iquote $$(CFG_LLVM_BUILD_DIR_$(1))/include
endif

RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp PassWrapper.cpp)
Expand Down

9 comments on commit d4ebe83

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at vadimcn@d4ebe83

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vadimcn/rust/rustllvm-build = d4ebe83 into auto

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vadimcn/rust/rustllvm-build = d4ebe83 merged ok, testing candidate = 6c749534

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1329
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1310
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1313
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/419
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/419
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1329
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/420
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/420
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/420
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/420
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/501
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1313
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/419
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/419
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1098

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at vadimcn@d4ebe83

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vadimcn/rust/rustllvm-build = d4ebe83 into auto

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vadimcn/rust/rustllvm-build = d4ebe83 merged ok, testing candidate = d39cec6

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1315
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1318
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/424
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/424
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1334
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/425
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/425
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1334
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/425
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/425
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/506
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1318
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/424
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/424
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/1103

@bors
Copy link
Contributor

@bors bors commented on d4ebe83 Sep 6, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = d39cec6

Please sign in to comment.