Skip to content

Commit 934ab35

Browse files
committed
Removed constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS
1 parent 511dfde commit 934ab35

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Diff for: legacy/builder/constants/constants.go

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ const BUILD_PROPERTIES_BUILD_BOARD = "build.board"
2626
const BUILD_PROPERTIES_BUILD_MCU = "build.mcu"
2727
const BUILD_PROPERTIES_COMPILER_C_ELF_FLAGS = "compiler.c.elf.flags"
2828
const BUILD_PROPERTIES_COMPILER_LDFLAGS = "compiler.ldflags"
29-
const BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS = "compiler.libraries.ldflags"
3029
const BUILD_PROPERTIES_COMPILER_CPP_FLAGS = "compiler.cpp.flags"
3130
const BUILD_PROPERTIES_COMPILER_WARNING_FLAGS = "compiler.warning_flags"
3231
const BUILD_PROPERTIES_FQBN = "build.fqbn"

Diff for: legacy/builder/phases/libraries_builder.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
160160
}
161161
}
162162

163-
currLDFlags := ctx.BuildProperties.Get(constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS)
164-
ctx.BuildProperties.Set(constants.BUILD_PROPERTIES_COMPILER_LIBRARIES_LDFLAGS, currLDFlags+"\"-L"+precompiledPath.String()+"\" "+libsCmd+" ")
163+
currLDFlags := ctx.BuildProperties.Get("compiler.libraries.ldflags")
164+
ctx.BuildProperties.Set("compiler.libraries.ldflags", currLDFlags+"\"-L"+precompiledPath.String()+"\" "+libsCmd+" ")
165165

166166
// TODO: This codepath is just taken for .a with unusual names that would
167167
// be ignored by -L / -l methods.

0 commit comments

Comments
 (0)