Updated Docker image to include flex, bison and binutils

Also do not depend on gcc, use clang to compile assembly, but specify that it should use the assembler coming with binutils.
osquery · Aug 26, 2019 · 03f1824 · 03f1824
1 parent 353a039
commit 03f1824
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,17 +20,12 @@ jobs:
       vmImage: 'Ubuntu-16.04'
 
     container:
-      image: trailofbits/osql-experimental:ubuntu-18.04
+      image: trailofbits/osquery:ubuntu-18.04
       options: --privileged
 
     timeoutInMinutes: 120
 
     steps:
-    # Temporary; this could be embedded in the Docker image, with the
-    # rest of the dependencies
-    - script: sudo apt-get update && sudo apt-get install flex bison gcc -y
-      displayName: "Installing Flex and Bison"
-
     - script: mkdir $(Build.BinariesDirectory)/build
       displayName: "Create build folder"
 

diff --git a/libraries/cmake/source/libgcrypt/CMakeLists.txt b/libraries/cmake/source/libgcrypt/CMakeLists.txt
@@ -166,7 +166,7 @@ function(libgcryptMain)
 
     add_custom_command(
       OUTPUT "${asm_object}"
-      COMMAND gcc -DHAVE_CONFIG_H -O2 -g -DNDEBUG -fPIC -std=gnu11 -o "${asm_object}" -c "${asm_source}" "-I${CMAKE_CURRENT_SOURCE_DIR}/config"
+      COMMAND ${CMAKE_C_COMPILER} -fno-integrated-as -DHAVE_CONFIG_H -O2 -g -DNDEBUG -fPIC -std=gnu11 -o "${asm_object}" -c "${asm_source}" "-I${CMAKE_CURRENT_SOURCE_DIR}/config"
       DEPENDS "${asm_source}"
       COMMENT "Assembling: ${asm_source}"
       VERBATIM