diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /build/moz.configure | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'build/moz.configure')
| -rw-r--r-- | build/moz.configure/init.configure | 5 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 5f7e9b3ee..7664591ad 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -607,8 +607,9 @@ def include_project_configure(project, external_source_dir, build_env, help): build_app = project[0] - # Uncomment when browser becomes application/basilisk - #if build_app == 'browser': + # XXX: Change this when 'browser' becomes invalid as an alias + if build_app == 'browser': + build_app = 'basilisk' #die('The project "browser" is no longer valid. Perhaps you meant "basilisk" or "palemoon"?') path_project_src_dir_application = os.path.join(base_dir, 'application/' + build_app, 'moz.configure') diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index c1ad71d5f..20bde1eee 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -213,6 +213,7 @@ def old_configure_options(*options): '--enable-pie', '--enable-png-arm-neon-support', '--enable-posix-nspr-emulation', + '--enable-precompiled-startupcache', '--enable-pref-extensions', '--enable-private-build', '--enable-pulseaudio', |