Skip to content

Commit

Permalink
Fix a typo in disable rpaths
Browse files Browse the repository at this point in the history 
Closes #5219
  • Loading branch information
@alexcrichton
alexcrichton committed Jan 28, 2014
1 parent b3d10f4 commit dea86ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ endif
ifdef TRACE
CFG_RUSTC_FLAGS += -Z trace
endif
ifdef DISABLE_RPATH
ifdef CFG_DISABLE_RPATH
# NOTE: make this CFG_RUSTC_FLAGS after stage0 snapshot
RUSTFLAGS_STAGE1 += --no-rpath
RUSTFLAGS_STAGE2 += --no-rpath
Expand Down

5 comments on commit dea86ca

@bors
Copy link
Contributor

@bors bors commented on dea86ca Jan 29, 2014

Choose a reason for hiding this comment

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

saw approval from thestinger
at alexcrichton@dea86ca

@bors
Copy link
Contributor

@bors bors commented on dea86ca Jan 29, 2014

Choose a reason for hiding this comment

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

merging alexcrichton/rust/rpath-for-real = dea86ca into auto

@bors
Copy link
Contributor

@bors bors commented on dea86ca Jan 29, 2014

Choose a reason for hiding this comment

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

alexcrichton/rust/rpath-for-real = dea86ca merged ok, testing candidate = 2ba72fa

@bors
Copy link
Contributor

@bors bors commented on dea86ca Jan 29, 2014

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/3868
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1710
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1712
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3868
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2968
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2974
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3883
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2971
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2977
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3885
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2971
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2976
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3045
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/823
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3876
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2977
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2982
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3645

@bors
Copy link
Contributor

@bors bors commented on dea86ca Jan 29, 2014

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 = 2ba72fa

Please sign in to comment.