diff options
| author | vpozdyayev <vpozdyayev@yandex-team.com> | 2024-09-09 06:38:08 +0300 |
|---|---|---|
| committer | vpozdyayev <vpozdyayev@yandex-team.com> | 2024-09-09 06:50:07 +0300 |
| commit | 9c4b2b4a59a3df8b790cd3a194889a2c5127f1bf (patch) | |
| tree | b3ae8f008870c411150a70df6160fda2edb0c654 /build/conf/linkers/ld.conf | |
| parent | 2cb42f4e81ff61b9724890830d657cdacab91eec (diff) | |
| download | ydb-9c4b2b4a59a3df8b790cd3a194889a2c5127f1bf.tar.gz | |
Enable the new command engine in LIBRARY() and PROGRAM()
df060b20e3d184ebea5f4893d74bac84002752a9
Diffstat (limited to 'build/conf/linkers/ld.conf')
| -rw-r--r-- | build/conf/linkers/ld.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 326d165f6d..e42fbea8b5 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -187,10 +187,10 @@ _ROOT_FLAGS=--source-root $ARCADIA_ROOT --build-root $(BUILD_ROOT) # Program GENERATE_MF_CMD=\ - $YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${input;hide:"build/scripts/process_command_files.py"} \ + $YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${hide;input:"build/scripts/process_command_files.py"} \ --build-root $ARCADIA_BUILD_ROOT \ --module-name $REALPRJNAME \ - -o ${output;rootrel;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \ + -o ${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \ -t $MODULE_TYPE \ --ya-start-command-file \ -Ya,lics $LICENSE_NAMES \ @@ -361,11 +361,11 @@ macro _FAT_OBJECT_ARGS_BASE(Flag, Lib) { } # FIXME: pre=lib here is weird legacy -_FAT_OBJECT_ARGS=--obj=${pre=lib;output:REALPRJNAME.o} +_FAT_OBJECT_ARGS=--obj=${output;pre=lib;suf=.o:REALPRJNAME} _LD_LINK_FAT_SRCS_GLOBALS=$_LD_LINK_FAT_SRCS_GLOBALS_WA macro PACK_GLOBALS_IN_LIBRARY() { - SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX:REALPRJNAME.globals.a})) + SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX;suf=.globals.a:REALPRJNAME})) } when ($OS_ANDROID == "yes") { |