X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=4aaca861260c339a510944a077b73a15487ef489;hb=5fcae2887e375be83480cee3305aa9798b56dcc8;hp=49e2a0392a4048da0498b34ab1f5779d228cdb22;hpb=94a6d1fb51c37ac763dab5abb01f04ab91d91ff6;p=lttng-ci.git diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 49e2a03..4aaca86 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -103,7 +103,7 @@ set_execute_traversal_bit() # Required variables WORKSPACE=${WORKSPACE:-} -arch=${arch:-} +platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} @@ -216,7 +216,7 @@ if [ "x${CC:-}" != "x" ]; then fi # Set platform variables -case "$arch" in +case "$platform" in macos*) export MAKE=make export TAR=tar @@ -260,7 +260,7 @@ esac # The missing-field-initializers warning code is very dumb in GCC 4.8 on # SLES12, disable it even if it's available. -if [ "$arch" = "sles12sp5" ]; then +if [[ $platform = sles12sp5* ]]; then CFLAGS="$CFLAGS -Wno-missing-field-initializers" CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers" fi