Bug 1299278 - remove --with-servo configure option; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Wed, 27 Jun 2018 12:57:39 -0400
changeset 424022 bd0da8113fac3b4028d253ad0cdd6f629555900c
parent 424021 dc7caa85ff1da9d4308c9d77571fae9b5fc74b07
child 424023 ce5b67578d0c1e9f22bbab7822d2717cd80c47fe
push id34198
push usercsabou@mozilla.com
push dateThu, 28 Jun 2018 10:05:18 +0000
treeherdermozilla-central@b429b9fb68f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1299278
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1299278 - remove --with-servo configure option; r=nalexander This option is no longer needed.
toolkit/library/moz.build
toolkit/moz.configure
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -209,22 +209,16 @@ if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
     OS_LIBS += [
         '-L%s' % CONFIG['MOZ_ANDROID_GOOGLE_VR_LIBS'],
         '-lgvr',
     ]
 
 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
 
-if CONFIG['SERVO_TARGET_DIR']:
-    if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
-        OS_LIBS += ['%s/geckoservo' % CONFIG['SERVO_TARGET_DIR']]
-    else:
-        OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
-
 if CONFIG['MOZ_SYSTEM_JPEG']:
     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
 
 if CONFIG['MOZ_SYSTEM_PNG']:
     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
 
 if CONFIG['MOZ_SYSTEM_LIBEVENT']:
     OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -800,26 +800,16 @@ with only_when('--enable-compile-environ
         return namespace(
             libclang_path=libclang_path,
             clang_path=clang_resolved,
         )
 
     set_config('MOZ_LIBCLANG_PATH', bindgen_config_paths.libclang_path)
     set_config('MOZ_CLANG_PATH', bindgen_config_paths.clang_path)
 
-option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,
-       help='Absolute path of the target directory where libgeckoservo can '
-            'be found. This is generally servo_src_dir/target/release.')
-
-@depends_if('--with-servo')
-def servo_target_dir(value):
-    return value[0]
-
-set_config('SERVO_TARGET_DIR', servo_target_dir)
-
 # WebRender integration
 option('--enable-webrender', nargs='?', choices=('build',),
        help='Include WebRender in the build and/or enable it at runtime')
 
 @depends('--enable-webrender')
 def webrender(value):
     build_webrender = None
     enable_webrender = None