Fix to netci break.

Note this is based upon Prajwal's original PR dotnet#5680
jashook · Jun 13, 2016 · 90ea03a · 90ea03a
1 parent 15643e9
commit 90ea03a
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/netci.groovy b/netci.groovy
@@ -1728,19 +1728,21 @@ combinedScenarios.each { scenario ->
                                         break
                                     }
                                     else {
-                                        // Unmount previously mounted rootfs and mount the Linux ARM emulator rootfs at /opt/linux-arm-emulator-root/
-                                        buildCommands += "if grep -qs '/opt/linux-arm-emulator-root' /proc/mounts; then sudo umount /opt/linux-arm-emulator-root; fi ; sudo mount /opt/linux-arm-emulator/platform/rootfs-t30.ext4 /opt/linux-arm-emulator-root/"
-                                        // Remove old copy of coreclr and copy the latest version of coreclr
-                                        // This need to be done as it is not possible to clone the repository inside the chroot jail
-                                        buildCommands += "sudo rm -rf /opt/linux-arm-emulator-root/home/coreclr; sudo mkdir /opt/linux-arm-emulator-root/home/coreclr; sudo cp -R ./ /opt/linux-arm-emulator-root/home/coreclr"
-
-                                        // Chroot into the Linux ARM emulator environment and execute the build
-                                        buildCommands += """echo \"Chrooting into Linux ARM emulator environment\"
-                                                            sudo chroot /opt/linux-arm-emulator-root/ /bin/bash -x <<EOF
-                                                            source /dotnet/setenv/setenv_coreclr.sh
-                                                            cd home/coreclr
-                                                            ./build.sh arm clean verbose skipmscorlib
-EOF"""
+                                                                                // Unmount previously mounted rootfs and mount the Linux ARM emulator rootfs at /opt/linux-arm-emulator-root/
+                                        buildCommands += "if grep -qs \$armrootfs_mountpath /proc/mounts; then sudo umount \$armrootfs_mountpath; fi ; sudo mount \$armemul_path/platform/rootfs-t30.ext4 \$armrootfs_mountpath"
+
+                                        // Export LINUX_ARM_INCPATH to hold the include paths to be used by CPLUS_INCLUDE_PATH environment variable
+                                        // Apply the changes needed to the library search paths to build for the emulator rootfs
+                                        buildCommands += """echo \"Exporting LINUX_ARM_INCPATH environment variable\"
+                                                            source \$armrootfs_mountpath/dotnet/setenv/setenv_incpath.sh \$armrootfs_mountpath
+
+                                                            echo \"Applying cross build patch to suit Linux ARM emulator rootfs\"
+                                                            git am < \$armrootfs_mountpath/dotnet/setenv/coreclr_cross.patch
+
+                                                            ROOTFS_DIR=\$armrootfs_mountpath CPLUS_INCLUDE_PATH=\$LINUX_ARM_INCPATH CXXFLAGS=\$LINUX_ARM_CXXFLAGS ./build.sh arm-softfp clean cross verbose skipmscorlib clang3.5 ${lowerConfiguration}
+
+                                                            echo \"Rewinding HEAD to master code\"
+                                                            git reset --hard HEAD^"""
 
                                         // Basic archiving of the build, no pal tests
                                         Utilities.addArchival(newJob, "/opt/linux-arm-emulator-root/home/coreclr/bin/Product/**")