diff options
author | Sinan Kaya <sinan.kaya@microsoft.com> | 2019-03-11 17:01:39 +0000 |
---|---|---|
committer | Sinan Kaya <sinan.kaya@microsoft.com> | 2019-03-17 21:10:56 +0000 |
commit | 9d81fad0a06a5153968493bf23e5b782789581c8 (patch) | |
tree | 747a90f160e3c23c76268643225128c4a6077f4e /build.sh | |
parent | d6449a27effa7c983488f183dd00942fa3e3e882 (diff) | |
download | coreclr-9d81fad0a06a5153968493bf23e5b782789581c8.tar.gz coreclr-9d81fad0a06a5153968493bf23e5b782789581c8.tar.bz2 coreclr-9d81fad0a06a5153968493bf23e5b782789581c8.zip |
Correct current script dir detection
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -276,16 +276,17 @@ build_native() pushd "$intermediatesForBuild" # Regenerate the CMake solution + scriptDir="$__ProjectRoot/src/pal/tools" if [[ $__GccBuild == 0 ]]; then scan_build= if [[ $__StaticAnalyzer == 1 ]]; then scan_build=scan-build fi - echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch $__BuildType $__CodeCoverage $scan_build $generator $extraCmakeArguments $__cmakeargs" - source "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch $__BuildType $__CodeCoverage $scan_build $generator "$extraCmakeArguments" "$__cmakeargs" + echo "Invoking \"$scriptDir/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $scan_build $generator $extraCmakeArguments $__cmakeargs" + source "$scriptDir/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $scan_build $generator "$extraCmakeArguments" "$__cmakeargs" else - echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-gcc.sh\" \"$__ProjectRoot\" $__GccMajorVersion \"$__GccMinorVersion\" $platformArch $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs" - source "$__ProjectRoot/src/pal/tools/gen-buildsys-gcc.sh" "$__ProjectRoot" "$__GccMajorVersion" "$__CGccMinorVersion" $platformArch $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs" + echo "Invoking \"$scriptDir/gen-buildsys-gcc.sh\" \"$__ProjectRoot\" $__GccMajorVersion \"$__GccMinorVersion\" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs" + source "$scriptDir/gen-buildsys-gcc.sh" "$__ProjectRoot" "$__GccMajorVersion" "$__CGccMinorVersion" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs" fi popd fi |