Browse Source

Fix EXPLICIT_OUTPUTS

spreis 1 year ago
parent
commit
ca464ac6b0
1 changed files with 5 additions and 5 deletions
  1. 5 5
      build/ymake.core.conf

+ 5 - 5
build/ymake.core.conf

@@ -3440,6 +3440,11 @@ module UNION: _BASE_UNIT {
     SET(DONT_RESOLVE_INCLUDES yes)
     SET(NEED_PLATFORM_PEERDIRS no)
     PEERDIR_TAGS=CPP_PROTO CPP_FBS PY2 PY2_NATIVE YQL_UDF_SHARED __EMPTY__ DOCSBOOK JAR_RUNNABLE PY3_BIN DLL PACKAGE_UNION
+
+    UNION_OUTS=${hide;late_out:AUTO_INPUT}
+    when ($_UNION_EXPLICIT_OUTPUTS) {
+        UNION_OUTS=$_EXPAND_INS_OUTS($_UNION_EXPLICIT_OUTPUTS)
+   }
 }
 
 # tag:python-specific
@@ -8032,7 +8037,6 @@ TOUCH_PACKAGE=$FAKE_PACKAGE_CMD $VCS_INFO_DISABLE_CACHE__NO_UID__ && $COPY_PACKA
 _P_PK=${kv;hide:"p PK"}
 TOUCH_PACKAGE_MF=$GENERATE_MF && $TOUCH_PACKAGE $_P_PK && $ADD_VCS_INFO_FILE_CMD
 
-UNION_OUTS=${hide;late_out:AUTO_INPUT}
 # Note: we don't use touch.py in the command below to avoid introduction of undesired input
 UNION_CMD=$YMAKE_PYTHON -c open(\'$TARGET\',\'w\').close() ${kv;hide:"p UN"} ${kv;hide:"package UNION"} ${kv;hide:"pc light-cyan"} $UNION_OUTS $VCS_INFO_DISABLE_CACHE__NO_UID__
 UNION_CMD_MF=$UNION_CMD && $GENERATE_MF
@@ -8041,10 +8045,6 @@ macro _EXPAND_INS_OUTS(FILES{input}[]) {
     .CMD=${input;hide:FILES} ${late_out;hide:INPUT}
 }
 
-when ($_UNION_EXPLICIT_OUTPUTS) {
-    UNION_OUTS=$_EXPAND_INS_OUTS($_UNION_EXPLICIT_OUTPUTS)
-}
-
 _UNION_EXPLICIT_OUTPUTS=
 
 ### @usage: EXPLICIT_OUTPUTS(Files...)