diff --git a/configs/components/cpp-hocon.rb b/configs/components/cpp-hocon.rb index 18e3ea0..c050118 100644 --- a/configs/components/cpp-hocon.rb +++ b/configs/components/cpp-hocon.rb @@ -49,7 +49,7 @@ toolchain = '' boost_static_flag = '-DBOOST_STATIC=OFF' special_flags = " -DENABLE_CXX_WERROR=OFF -DCMAKE_CXX_FLAGS='#{settings[:cflags]}'" - cmake = if platform.name =~ /amazon-7-aarch64/ + cmake = if platform.name =~ /amazon-2-aarch64/ '/usr/bin/cmake3' else 'cmake' diff --git a/configs/components/cpp-pcp-client.rb b/configs/components/cpp-pcp-client.rb index a719dcb..eb7f12f 100644 --- a/configs/components/cpp-pcp-client.rb +++ b/configs/components/cpp-pcp-client.rb @@ -59,7 +59,7 @@ toolchain = '' platform_flags = "-DCMAKE_CXX_FLAGS='#{settings[:cflags]} -Wimplicit-fallthrough=0'" special_flags = ' -DENABLE_CXX_WERROR=OFF' - cmake = if platform.name =~ /amazon-7-aarch64/ + cmake = if platform.name =~ /amazon-2-aarch64/ '/usr/bin/cmake3' else 'cmake' diff --git a/configs/components/leatherman.rb b/configs/components/leatherman.rb index 8c33c19..14fa475 100644 --- a/configs/components/leatherman.rb +++ b/configs/components/leatherman.rb @@ -88,7 +88,7 @@ pkg.environment 'LDFLAGS', settings[:ldflags] toolchain = '' boost_static_flag = '' - cmake = if platform.name =~ /amazon-7-aarch64/ + cmake = if platform.name =~ /amazon-2-aarch64/ '/usr/bin/cmake3' else 'cmake' diff --git a/configs/components/pxp-agent.rb b/configs/components/pxp-agent.rb index f6dc9db..bfaf507 100644 --- a/configs/components/pxp-agent.rb +++ b/configs/components/pxp-agent.rb @@ -73,7 +73,7 @@ toolchain = '' special_flags += " -DCMAKE_CXX_FLAGS='#{settings[:cflags]} -Wno-deprecated -Wimplicit-fallthrough=0' " special_flags += ' -DENABLE_CXX_WERROR=OFF ' unless platform.name =~ /sles-15/ - cmake = if platform.name =~ /amazon-7-aarch64/ + cmake = if platform.name =~ /amazon-2-aarch64/ '/usr/bin/cmake3' else 'cmake' diff --git a/configs/platforms/amazon-2-aarch64.rb b/configs/platforms/amazon-2-aarch64.rb new file mode 100644 index 0000000..a528d3e --- /dev/null +++ b/configs/platforms/amazon-2-aarch64.rb @@ -0,0 +1,3 @@ +platform "amazon-2-aarch64" do |plat| + plat.inherit_from_default +end diff --git a/configs/platforms/amazon-7-aarch64.rb b/configs/platforms/amazon-7-aarch64.rb deleted file mode 100644 index 4aafe85..0000000 --- a/configs/platforms/amazon-7-aarch64.rb +++ /dev/null @@ -1,3 +0,0 @@ -platform "amazon-7-aarch64" do |plat| - plat.inherit_from_default -end