diff options
| author | Lauri Nurmi <[email protected]> | 2018-05-22 16:56:39 +0300 |
|---|---|---|
| committer | Lauri Nurmi <[email protected]> | 2018-05-24 22:56:41 +0300 |
| commit | d8b909e3c7823e17b7fe9c405393f7d9a19aa7b9 (patch) | |
| tree | d58ab0778ba5ff1a8efad4fc9fa80e0192ec7873 /src/build-data | |
| parent | 9535a0d01d3491b1383c48554e67e06bf9803451 (diff) | |
Keep cxx_abi_flags out of CXX, which may get overridden
Overriding CXX with the make command results in cxx_abi_flags being ignored, which in turn may lead to a linking error.
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in index 5b408c016..6dc438d0c 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in @@ -1,12 +1,13 @@ # Paths to relevant programs -CXX = %{cxx} %{cxx_abi_flags} +CXX = %{cxx} LINKER = %{linker} AR = %{ar_command} PYTHON_EXE = %{python_exe} # Compiler Flags +ABI_FLAGS = %{cxx_abi_flags} LANG_FLAGS = %{cc_lang_flags} CXXFLAGS = %{cc_compile_flags} WARN_FLAGS = %{cc_warning_flags} @@ -19,7 +20,7 @@ POST_LINK_CMD = %{post_link_cmd} LIB_LINKS_TO = %{link_to} EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) -BUILD_FLAGS = $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS) +BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS) SCRIPTS_DIR = %{scripts_dir} INSTALLED_LIB_DIR = %{prefix}/%{libdir} @@ -65,11 +66,11 @@ TESTOBJS = %{join test_objs} # Executable targets $(CLI): $(LIBRARIES) $(CLIOBJS) - $(EXE_LINK_CMD) $(LDFLAGS) $(CLIOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@ + $(EXE_LINK_CMD) $(ABI_FLAGS) $(LDFLAGS) $(CLIOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@ $(POST_LINK_CMD) $(TEST): $(LIBRARIES) $(TESTOBJS) - $(EXE_LINK_CMD) $(LDFLAGS) $(TESTOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@ + $(EXE_LINK_CMD) $(ABI_FLAGS) $(LDFLAGS) $(TESTOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@ $(POST_LINK_CMD) %{if build_fuzzers} @@ -98,7 +99,7 @@ fuzzer_corpus_zip: fuzzer_corpus %{if build_shared_lib} %{out_dir}/%{shared_lib_name}: $(LIBOBJS) - %{lib_link_cmd} $(LDFLAGS) $(LIBOBJS) $(LIB_LINKS_TO) %{output_to_exe}$@ + %{lib_link_cmd} $(ABI_FLAGS) $(LDFLAGS) $(LIBOBJS) $(LIB_LINKS_TO) %{output_to_exe}$@ %{endif} %{if symlink_shared_lib} cd %{out_dir} && ln -fs %{shared_lib_name} %{soname_base} @@ -127,5 +128,5 @@ fuzzer_corpus_zip: fuzzer_corpus $(CXX) $(BUILD_FLAGS) %{isa_flags} %{include_paths} %{dash_c} %{src} %{dash_o}$@ %{exe}: %{obj} $(LIBRARIES) - $(EXE_LINK_CMD) %{obj} $(EXE_LINKS_TO) %{fuzzer_lib} %{output_to_exe}$@ + $(EXE_LINK_CMD) $(ABI_FLAGS) %{obj} $(EXE_LINKS_TO) %{fuzzer_lib} %{output_to_exe}$@ %{endfor} |