Skip to content

Commit

Permalink
configure: Remove legacy triple flags.
Browse files Browse the repository at this point in the history
  • Loading branch information
@luqmana
luqmana committed Nov 1, 2013
1 parent 12222f9 commit d9decf3
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,6 @@ valopt infodir "${CFG_PREFIX}/share/info" "install additional info"
valopt mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
valopt libdir "${CFG_PREFIX}/lib" "install libraries"

#Deprecated opts to keep compatibility
valopt build-triple "" "LLVM build triple"
valopt host-triples "" "LLVM host triples"
valopt target-triples "" "LLVM target triples"

# Validate Options
step_msg "validating $CFG_SELF args"
validate_opt
Expand Down Expand Up @@ -601,19 +596,6 @@ then
fi

# a little post-processing of various config values

# XXX: Support for deprecated syntax, should be dropped.
if [ ! -z "$CFG_BUILD_TRIPLE" ]; then
CFG_BUILD=${CFG_BUILD_TRIPLE}
fi
if [ ! -z "$CFG_HOST_TRIPLES" ]; then
CFG_HOST=${CFG_HOST_TRIPLES}
fi
if [ ! -z "$CFG_TARGET_TRIPLES" ]; then
CFG_TARGET=${CFG_TARGET_TRIPLES}
fi


CFG_PREFIX=${CFG_PREFIX%/}
CFG_MANDIR=${CFG_MANDIR%/}
CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
Expand Down

5 comments on commit d9decf3

@bors
Copy link
Contributor

@bors bors commented on d9decf3 Nov 1, 2013

Choose a reason for hiding this comment

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

saw approval from brson
at luqmana@d9decf3

@bors
Copy link
Contributor

@bors bors commented on d9decf3 Nov 1, 2013

Choose a reason for hiding this comment

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

merging luqmana/rust/con = d9decf3 into auto

@bors
Copy link
Contributor

@bors bors commented on d9decf3 Nov 1, 2013

Choose a reason for hiding this comment

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

luqmana/rust/con = d9decf3 merged ok, testing candidate = 8ea2123

@bors
Copy link
Contributor

@bors bors commented on d9decf3 Nov 1, 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/2277
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/123
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/123
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/2281
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1387
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1386
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/2295
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1387
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1387
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/2296
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1387
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1387
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/1463
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2281
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1385
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1387
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2059

@bors
Copy link
Contributor

@bors bors commented on d9decf3 Nov 1, 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 = 8ea2123

Please sign in to comment.