Skip to content

Commit 05e290e

Browse files
OS X and other BSDs don't have a readlink that accepts -m. Fixes rust-lang#12.
1 parent 3153c10 commit 05e290e

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Diff for: configure

+1-4
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ opt verify-install 1 "verify installed binaries work"
525525
opt dist-host-only 0 "only install bins for the host architecture"
526526
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
527527
opt jemalloc 1 "build liballoc with jemalloc"
528-
valopt nacl-cross-path "" "NaCl Pepper sdk path (should be something like \"nacl_sdk/pepper_[0-9]+/\")"
528+
valopt nacl-cross-path "" "NaCl Pepper sdk path (should be something like \"nacl_sdk/pepper_[0-9]+/\"). Must be absolute!"
529529
valopt emscripten-cross-path "" "Emscripten checkout path (should point to where emcc lives)"
530530

531531
valopt localstatedir "/var/lib" "local state directory"
@@ -971,9 +971,6 @@ do
971971
err "I need the NaCl SDK path! (use --nacl-cross-path)"
972972
fi
973973

974-
# use an absolute path.
975-
CFG_NACL_CROSS_PATH=`readlink -m $CFG_NACL_CROSS_PATH`
976-
977974
# quick and dirty check for cross existence
978975
case $CFG_OSTYPE in
979976
apple-darwin)

0 commit comments

Comments
 (0)