From 252e4f6299d9bb4a34693ba1527240b7a4d17f55 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 15 Aug 2018 14:19:30 -0400 Subject: [PATCH] configure: Set a default LINKFLAGS in addition to LDFLAGS. The former is passed to the compiler when linking using it, the latter is passed to ld when it is invoked directly. Also modify ArchitectureRules to not overwrite this setting. --- build/jam/ArchitectureRules | 2 +- configure | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index 96d7683a46..7df58798d5 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -70,10 +70,10 @@ rule ArchitectureSetup architecture # initial state for flags etc. HAIKU_C++_$(architecture) ?= $(HAIKU_CC_$(architecture)) ; HAIKU_LINK_$(architecture) = $(HAIKU_CC_$(architecture)) ; - HAIKU_LINKFLAGS_$(architecture) = $(ccBaseFlags) ; HAIKU_CCFLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ; HAIKU_C++FLAGS_$(architecture) += $(ccBaseFlags) -nostdinc ; + HAIKU_LINKFLAGS_$(architecture) += $(ccBaseFlags) ; HAIKU_ASFLAGS_$(architecture) += $(archFlags) -nostdinc ; # strip is required diff --git a/configure b/configure index e32c96be65..a6750ca7bd 100755 --- a/configure +++ b/configure @@ -110,6 +110,8 @@ environment variables: Defaults to "". HAIKU_CXXFLAGS_ The C++ flags for target architecture . Defaults to "". + HAIKU_LINKFLAGS_ The flags passed to the compiler when linking for + target architecture . Defaults to "". HAIKU_LDFLAGS_ The linker flags for target architecture . Defaults to "". HAIKU_ARFLAGS_ The flags passed to HAIKU_AR for target @@ -945,6 +947,7 @@ else set_default_value HAIKU_CPPFLAGS_$targetArch "" set_default_value HAIKU_CCFLAGS_$targetArch "" set_default_value HAIKU_CXXFLAGS_$targetArch "" + set_default_value HAIKU_LINKFLAGS_$targetArch "" set_default_value HAIKU_LDFLAGS_$targetArch "" set_default_value HAIKU_ARFLAGS_$targetArch cru set_default_value HAIKU_UNARFLAGS_$targetArch x @@ -1053,6 +1056,7 @@ for targetArch in $HAIKU_PACKAGING_ARCHS; do HAIKU_CPPFLAGS HAIKU_CPPFLAGS HAIKU_CCFLAGS HAIKU_CCFLAGS HAIKU_C++FLAGS HAIKU_CXXFLAGS + HAIKU_LINKFLAGS HAIKU_LINKFLAGS HAIKU_LDFLAGS HAIKU_LDFLAGS HAIKU_ARFLAGS HAIKU_ARFLAGS HAIKU_UNARFLAGS HAIKU_UNARFLAGS