Merge pull request #89 from vsimon/fix-abseil

Fix packaging for revisions prior to the introduction of abseil-cpp
vsimon · Aug 17, 2018 · 4bc7a6b · 4bc7a6b
2 parents 738cb0a + c9108ae
commit 4bc7a6b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/util.sh b/util.sh
@@ -343,9 +343,12 @@ function package::prepare() {
     headersSourceDir=.
   fi
   find $headersSourceDir -path './third_party*' -prune -o -name '*.h' -exec $CP --parents '{}' $headersDestDir ';'
-  pushd $headersSourceDir/third_party/abseil-cpp >/dev/null
-  find . -name '*.h' -exec $CP --parents '{}' $headersDestDir ';'
-  popd >/dev/null
+  # Revision 23941 introduced absl::optional from abseil-cpp
+  if [[ $revision_number -ge 23941 ]]; then
+    pushd $headersSourceDir/third_party/abseil-cpp >/dev/null
+    find . -name '*.h' -exec $CP --parents '{}' $headersDestDir ';'
+    popd >/dev/null
+  fi
   popd >/dev/null
   # find and copy libraries
   pushd src/out >/dev/null