Skip to content

More work on installers #13151

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

Merged
merged 13 commits into from
Mar 27, 2014
Merged

More work on installers #13151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ff17b7c
mk: Remove leading './' from manifest entries
brson Mar 26, 2014
e509cd6
Revert "Revert "mk: Run 'make install' through install.sh""
brson Mar 26, 2014
6f9b30c
configure: Make rustlibdir non-configurable
brson Mar 26, 2014
f772e31
rustc: Stop relying on CFG_LIBDIR_RELATIVE
brson Mar 26, 2014
d252539
mk: Rename CFG_COMPILER to CFG_COMPILER_HOST_TRIPLE
brson Mar 26, 2014
00f7776
mk: Make nightlyism a configure option
brson Mar 26, 2014
380fe97
mk: Fix deps for prepare host tools
brson Mar 26, 2014
ce1e48a
install: Support --libdir and --mandir correctly
brson Mar 26, 2014
92d0ec2
install: name the bundled manifest 'manifest.in'. Cleanup
brson Mar 26, 2014
c060e2e
install: Don't allow installation over the install files
brson Mar 27, 2014
545f012
rustc: Fix detection of lib64 directory
brson Mar 27, 2014
6f7ef1e
rustc: Fix tests for sysroot changes
brson Mar 27, 2014
0f4f786
mk: Use 'find' invocation that works on mac
brson Mar 27, 2014
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
Prev Previous commit
Next Next commit
mk: Make nightlyism a configure option
  • Loading branch information
@brson
brson committed Mar 26, 2014
commit 00f7776daad5fc299d19346cdba21f22ab2fd79a
1 change: 1 addition & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
opt rpath 1 "build rpaths into rustc itself"
opt nightly 0 "build nightly packages"
valopt prefix "/usr/local" "set installation prefix"
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
valopt llvm-root "" "set LLVM root"
Expand Down
2 changes: 1 addition & 1 deletion mk/main.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
CFG_RELEASE_NUM=0.10
CFG_RELEASE_LABEL=-pre

ifndef CFG_NIGHTLY
ifndef CFG_ENABLE_NIGHTLY
# This is the normal version string
CFG_RELEASE=$(CFG_RELEASE_NUM)$(CFG_RELEASE_LABEL)
CFG_PACKAGE_VERS=$(CFG_RELEASE)
Expand Down