Skip to content

Buildsystem patches #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Buildsystem patches #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cc900a
Use CFG_LLVM_ROOT's llvm-config if it exists.
erickt May 19, 2011
12f4d04
Make sure we're using clang >=3.0svn.
erickt May 19, 2011
23259c2
librustc depends on rustllvm and std.
erickt May 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,12 @@ then
putvar CFG_BAD_VALGRIND
fi

if [ ! -z "$CFG_LLVM_ROOT" ]
if [ ! -z "$CFG_LLVM_ROOT" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
then
CFG_LLVM_CONFIG="$CFG_LLVM_ROOT/bin/llvm-config"
fi

if [ ! -z "$CFG_LLVM_ROOT" -a -z "$CFG_LLVM_CONFIG" ]
then
CFG_LLVM_INCDIR="$CFG_LLVM_ROOT/include"
CFG_LLVM_BINDIR="$CFG_LLVM_ROOT/bin"
Expand All @@ -247,14 +252,14 @@ then
| cut -d ' ' -f 4-)
elif [ ! -z "$CFG_LLVM_CONFIG" ]
then
CFG_LLVM_VERSION=$(llvm-config --version)
CFG_LLVM_INCDIR=$(llvm-config --includedir)
CFG_LLVM_BINDIR=$(llvm-config --bindir)
CFG_LLVM_LIBDIR=$(llvm-config --libdir)
CFG_LLVM_CXXFLAGS=$(llvm-config --cxxflags)
CFG_LLVM_LDFLAGS=$(llvm-config --ldflags)
CFG_LLVM_LIBS=$(llvm-config --libs)
CFG_LLVM_TRIPLE=$(llvm-config --host-target)
CFG_LLVM_VERSION=$($CFG_LLVM_CONFIG --version)
CFG_LLVM_INCDIR=$($CFG_LLVM_CONFIG --includedir)
CFG_LLVM_BINDIR=$($CFG_LLVM_CONFIG --bindir)
CFG_LLVM_LIBDIR=$($CFG_LLVM_CONFIG --libdir)
CFG_LLVM_CXXFLAGS=$($CFG_LLVM_CONFIG --cxxflags)
CFG_LLVM_LDFLAGS=$($CFG_LLVM_CONFIG --ldflags)
CFG_LLVM_LIBS=$($CFG_LLVM_CONFIG --libs)
CFG_LLVM_TRIPLE=$($CFG_LLVM_CONFIG --host-target)
else
err "either the \"CFG_LLVM_ROOT\" environment variable must be set, or a \
\"llvm-config\" script must be present"
Expand All @@ -269,6 +274,23 @@ case $CFG_LLVM_VERSION in
;;
esac

if [ ! -z "$CFG_CLANG" ]
then
CFG_CLANG_VERSION=$("$CFG_CLANG" \
--version \
| grep version \
| cut -d ' ' -f 3)

case $CFG_CLANG_VERSION in
(3.0svn | 3.0)
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
;;
(*)
err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn"
;;
esac
fi

putvar CFG_LLVM_ROOT
putvar CFG_LLVM_INCDIR
putvar CFG_LLVM_BINDIR
Expand Down
2 changes: 1 addition & 1 deletion mk/stage1.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stage1/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
stage1/$(CFG_RUSTCLIB): stage1/librustc.o stage1/glue.o
@$(call E, link: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage1/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-o $@ $< -Lstage1 -Lrt -lrustrt
-o $@ $< -Lstage1 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd

stage1/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ0)
@$(call E, compile: $@)
Expand Down
2 changes: 1 addition & 1 deletion mk/stage2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stage2/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
stage2/$(CFG_RUSTCLIB): stage2/librustc.o stage2/glue.o
@$(call E, link: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage2/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-o $@ $< -Lstage2 -Lrt -lrustrt
-o $@ $< -Lstage2 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd

stage2/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ1)
@$(call E, compile: $@)
Expand Down
2 changes: 1 addition & 1 deletion mk/stage3.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stage3/librustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
stage3/$(CFG_RUSTCLIB): stage3/librustc.o stage3/glue.o
@$(call E, link: $@)
$(Q)gcc $(CFG_GCCISH_CFLAGS) stage3/glue.o $(CFG_GCCISH_LINK_FLAGS) \
-o $@ $< -Lstage3 -Lrt -lrustrt
-o $@ $< -Lstage3 -Lrustllvm -Lrt -lrustrt -lrustllvm -lstd

stage3/rustc.o: $(COMPILER_CRATE) $(COMPILER_INPUTS) $(SREQ2)
@$(call E, compile: $@)
Expand Down