Portable copy_dir_contents_to_dir (#1246)

Co-authored-by: James Sharpe <[email protected]>
bazel-contrib · Aug 8, 2024 · 509b5aa · 509b5aa
1 parent af66969
commit 509b5aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/foreign_cc/private/framework/toolchains/freebsd_commands.bzl b/foreign_cc/private/framework/toolchains/freebsd_commands.bzl
@@ -95,11 +95,11 @@ fi
     )
 
 def copy_dir_contents_to_dir(source, target):
-    # Beause FreeBSD `cp` doesn't have `--no-copy-directory`, we have to
+    # Beause FreeBSD `cp` doesn't have `--no-target-directory`, we have to
     # do something more complex for this environment.
     return """\
 if [[ -d "{source}" ]]; then
-  cp -L -R "{source}"/* "{target}"
+  cp -L -R "{source}"/. "{target}"
 else
   cp -L -R "{source}" "{target}"
 fi

diff --git a/foreign_cc/private/framework/toolchains/macos_commands.bzl b/foreign_cc/private/framework/toolchains/macos_commands.bzl
@@ -86,11 +86,11 @@ fi
     )
 
 def copy_dir_contents_to_dir(source, target):
-    # Beause macos `cp` doesn't have `--no-copy-directory`, we have to
+    # Beause macos `cp` doesn't have `--no-target-directory`, we have to
     # do something more complext for this environment.
     return """\
 if [[ -d "{source}" ]]; then
-  cp -L -R "{source}"/ "{target}"
+  cp -L -R "{source}"/. "{target}"
 else
   cp -L -R "{source}" "{target}"
 fi