import quincy beta 17.1.0

[ceph.git] / ceph / src / nasm-wrapper

diff --git a/ceph/src/nasm-wrapper b/ceph/src/nasm-wrapper
index 9e950ff5861662f2279354fa0a6ac624bbb8c65f..e67da7cba1a47603b98268e457992fdaa354c885 100755 (executable)
--- a/ceph/src/nasm-wrapper
+++ b/ceph/src/nasm-wrapper
@@ -7,7 +7,7 @@ while [ -n "$*" ]; do
     case "$1" in
     -f )
         shift
-        refine_nasm_options="$refine_nasm_options -f $1"
+        refine_nasm_options+=" -f $1"
         shift
         ;;
     -c | --param* | -m* | -pipe | -thread )
@@ -18,6 +18,13 @@ while [ -n "$*" ]; do
         # ignore debug format
         shift
         ;;
+    -MD )
+        # before CMake v3.18, its ninja build rule always passes `-MD $DEP_FILE``
+        # to ASM_COMPILER. both nasm and GNU assembler accepts this option, but
+        # somehow the ninja generator fails to pass the <DEPFILE> argument. so
+        # just drop it.
+        shift
+        ;;
     -W* )
         # Warning/error option
         shift
@@ -27,12 +34,12 @@ while [ -n "$*" ]; do
         ;;
     -I | -isystem )
         shift
-        refine_nasm_options="$refine_nasm_options -i $1"
+        refine_nasm_options+=" -i $1"
         shift
         ;;
     * )
         # Keep other options
-        refine_nasm_options="$refine_nasm_options $1"
+        refine_nasm_options+=" $1"
         shift
         ;;
     esac