From ee3ed2b4c4e5cbac25a973cf0af4bba12ca0444e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Thu, 20 Jul 2017 19:54:17 +0200
Subject: [PATCH] Make travis statically link libvg crt. (#15466)

This was disabled because it required nightly Rust.
With Rust 1.19, static crt linking is stable.
---
 .travis.yml         | 1 -
 libvg/.cargo/config | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a60e5731774..48884e992280 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,6 @@ script:
 - python tools/changelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run
 - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
 - cd libvg
-- rm .cargo/config
 # --jobs 1 to prevent threading problems with the BYOND crate.
 - cargo test --jobs 1 --verbose
 - cd -
diff --git a/libvg/.cargo/config b/libvg/.cargo/config
index 38ffad9e807f..a59c6d8bcf54 100644
--- a/libvg/.cargo/config
+++ b/libvg/.cargo/config
@@ -1,4 +1,2 @@
 [build]
-# If you're gonna change anything here.
-# Make Travis not blindly delete this to be able to use stable.
-rustflags = ["-Z", "unstable-options", "-C", "target-feature=+crt-static"]
\ No newline at end of file
+rustflags = ["-C", "target-feature=+crt-static"]
\ No newline at end of file