Commit 876ff885 authored by saltedcoffii's avatar saltedcoffii Committed by GitHub

Revert CREW_BUILD autodetect (#5494)

parent 487f224a
# Defines common constants used in different parts of crew # Defines common constants used in different parts of crew
CREW_VERSION = '1.7.17' CREW_VERSION = '1.7.18'
ARCH_ACTUAL = `uname -m`.strip ARCH_ACTUAL = `uname -m`.strip
# This helps with virtualized builds on aarch64 machines # This helps with virtualized builds on aarch64 machines
...@@ -63,13 +63,15 @@ CHROMEOS_RELEASE = `grep CHROMEOS_RELEASE_CHROME_MILESTONE= /etc/lsb-release | c ...@@ -63,13 +63,15 @@ CHROMEOS_RELEASE = `grep CHROMEOS_RELEASE_CHROME_MILESTONE= /etc/lsb-release | c
case ARCH case ARCH
when 'aarch64', 'armv7l' when 'aarch64', 'armv7l'
CREW_TGT = 'armv7l-cros-linux-gnueabihf' CREW_TGT = 'armv7l-cros-linux-gnueabihf'
CREW_BUILD = 'armv7l-cros-linux-gnueabihf'
when 'i686' when 'i686'
CREW_TGT = 'i686-cros-linux-gnu' CREW_TGT = 'i686-cros-linux-gnu'
CREW_BUILD = 'i686-cros-linux-gnu'
when 'x86_64' when 'x86_64'
CREW_TGT = 'x86_64-cros-linux-gnu' CREW_TGT = 'x86_64-cros-linux-gnu'
CREW_BUILD = 'x86_64-cros-linux-gnu'
end end
CREW_BUILD = `#{CREW_PREFIX}/share/automake-*/config.guess`.strip # strip to remove newline
CREW_OPTIONS = "--prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --mandir=#{CREW_MAN_PREFIX} --build=#{CREW_BUILD} --host=#{CREW_TGT} --target=#{CREW_TGT} --program-prefix='' --program-suffix=''" CREW_OPTIONS = "--prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --mandir=#{CREW_MAN_PREFIX} --build=#{CREW_BUILD} --host=#{CREW_TGT} --target=#{CREW_TGT} --program-prefix='' --program-suffix=''"
CREW_MESON_OPTIONS = "-Dprefix=#{CREW_PREFIX} -Dlibdir=#{CREW_LIB_PREFIX} -Dmandir=#{CREW_MAN_PREFIX} -Dbuildtype=release -Dc_args='-fuse-ld=lld -pipe' -Dcpp_args='-fuse-ld=lld -pipe'" CREW_MESON_OPTIONS = "-Dprefix=#{CREW_PREFIX} -Dlibdir=#{CREW_LIB_PREFIX} -Dmandir=#{CREW_MAN_PREFIX} -Dbuildtype=release -Dc_args='-fuse-ld=lld -pipe' -Dcpp_args='-fuse-ld=lld -pipe'"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment