Bug 1368099 - part 1 - provide the correct --with-libclang-path suggestions; r=rillian
authorNathan Froyd <froydnj@mozilla.com>
Fri, 26 May 2017 22:36:35 -0400
changeset 409083 3d25c3ea9b76c65bc03332001a72513128dc6861
parent 409082 01e588f75f63f44b4ba599450d495751dcc64877
child 409084 9299b94487189323212d76ca5cd231be51566287
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1368099
milestone55.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 1368099 - part 1 - provide the correct --with-libclang-path suggestions; r=rillian libclang.dll lives in the bin/ directory, not the lib/ directory.
python/mozboot/mozboot/mozillabuild.py
python/mozboot/mozboot/windows.py
--- a/python/mozboot/mozboot/mozillabuild.py
+++ b/python/mozboot/mozboot/mozillabuild.py
@@ -12,17 +12,17 @@ from mozboot.base import BaseBootstrappe
 
 STYLO_MOZCONFIG = '''
 To enable Stylo in your builds, paste the lines between the chevrons
 (>>> and <<<) into your mozconfig file:
 
 <<<
 ac_add_options --enable-stylo
 
-ac_add_options --with-libclang-path={state_dir}/clang/lib
+ac_add_options --with-libclang-path={state_dir}/clang/bin
 ac_add_options --with-clang-path={state_dir}/clang/bin/clang.exe
 >>>
 '''
 
 class MozillaBuildBootstrapper(BaseBootstrapper):
     '''Bootstrapper for MozillaBuild to install rustup.'''
     def __init__(self, no_interactive=False):
         BaseBootstrapper.__init__(self, no_interactive=no_interactive)
--- a/python/mozboot/mozboot/windows.py
+++ b/python/mozboot/mozboot/windows.py
@@ -10,17 +10,17 @@ from mozboot.base import BaseBootstrappe
 
 STYLO_MOZCONFIG = '''
 To enable Stylo in your builds, paste the lines between the chevrons
 (>>> and <<<) into your mozconfig file:
 
 <<<
 ac_add_options --enable-stylo
 
-ac_add_options --with-libclang-path={state_dir}/clang/lib
+ac_add_options --with-libclang-path={state_dir}/clang/bin
 ac_add_options --with-clang-path={state_dir}/clang/bin/clang.exe
 >>>
 '''
 
 
 class WindowsBootstrapper(BaseBootstrapper):
     '''Bootstrapper for msys2 based environments for building in Windows.'''