Skip to content

Commit 46bdb45

Browse files
committed
Merge pull request #1 from rust-lang/master
Update from original
2 parents f530aa0 + 7765993 commit 46bdb45

File tree

94 files changed

+624
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+624
-444
lines changed

AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ Cole Mickens <[email protected]>
121121
Colin Davidson <[email protected]>
122122
Colin Sherratt <[email protected]>
123123
Conrad Kleinespel <[email protected]>
124+
Corey Farwell <[email protected]>
124125
Corey Ford <[email protected]>
125126
Corey Richardson <[email protected]>
126127

configure

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,10 @@ CFG_PREFIX=${CFG_PREFIX%/}
893893
CFG_MANDIR=${CFG_MANDIR%/}
894894
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
895895
CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
896-
CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
896+
CFG_SUPPORTED_TARGET=""
897+
for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
898+
CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
899+
done
897900

898901
# copy host-triples to target-triples so that hosts are a subset of targets
899902
V_TEMP=""
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)