diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-19 16:30:47 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-19 16:30:47 -0700 |
| commit | ccf5f96fa91540ca73cfb24dd130d5124975fc6e (patch) | |
| tree | 271394dd84980920dbe9b0642cb69613645e7304 /python | |
| parent | 1e85bb67b24483d08edfdc868454fd86dee3ece8 (diff) | |
| parent | a2a74cbb4ff09715c39f270b4bee82cd0459ee64 (diff) | |
| download | servo-ccf5f96fa91540ca73cfb24dd130d5124975fc6e.tar.gz servo-ccf5f96fa91540ca73cfb24dd130d5124975fc6e.zip | |
auto merge of #4672 : glennw/servo/make-glutin-default, r=larsbergstrom
This change makes glutin the default windowing system on mac/linux.
If you run into any issues with the glutin system, you can temporarily
build the GLFW system with the following command:
cd components/servo
../../mach cargo build --no-default-features --features=glfw
Once any glutin related issues have been sorted out, the GLFW
port will be removed.
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index aafaa815af1..78d9fb51318 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -64,10 +64,7 @@ class MachCommands(CommandBase): with cd(path.join(apk_builder_dir, "apk-builder")): subprocess.call(["cargo", "build"], env=self.build_env()) - # FIXME: This can be simplified when glutin becomes the default - # and glfw has been removed. - opts += ["--target", "arm-linux-androideabi", "--no-default-features"] - features += ["glutin"] + opts += ["--target", "arm-linux-androideabi"] if debug_mozjs or self.config["build"]["debug-mozjs"]: features += ["script/debugmozjs"] |