Fix build error for mscoree coreclr.exports (dotnet/coreclr#24547)
authorGleb Balykov <g.balykov@samsung.com>
Mon, 13 May 2019 17:14:28 +0000 (20:14 +0300)
committerJeremy Koritzinsky <jekoritz@microsoft.com>
Mon, 13 May 2019 17:14:27 +0000 (10:14 -0700)
This partially reverts dotnet/coreclr#23853

Commit migrated from https://github.com/dotnet/coreclr/commit/24cdacaeb1e42a92051b32a6c4051b7a12ff2770

src/coreclr/functions.cmake

index d20a574..d868445 100644 (file)
@@ -86,7 +86,11 @@ function(preprocess_def_file inputFilename outputFilename)
                               PROPERTIES GENERATED TRUE)
 endfunction()
 
-function(generate_exports_file inputFilename outputFilename)
+function(generate_exports_file)
+  set(INPUT_LIST ${ARGN})
+  list(GET INPUT_LIST -1 outputFilename)
+  list(REMOVE_AT INPUT_LIST -1)
+
   if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
     set(AWK_SCRIPT generateexportedsymbols.awk)
   else()
@@ -95,8 +99,8 @@ function(generate_exports_file inputFilename outputFilename)
 
   add_custom_command(
     OUTPUT ${outputFilename}
-    COMMAND ${AWK} -f ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT} ${inputFilename} >${outputFilename}
-    DEPENDS ${inputFilename} ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT}
+    COMMAND ${AWK} -f ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT} ${INPUT_LIST} >${outputFilename}
+    DEPENDS ${INPUT_LIST} ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT}
     COMMENT "Generating exports file ${outputFilename}"
   )
   set_source_files_properties(${outputFilename}