Skip to content

Commit

Permalink
Fix issue that prevents you overriding CFLAGS at the make command line.
Browse files Browse the repository at this point in the history
Change-Id: Ia387ad57f865ec8786fcdb03074489946906d2dc
Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
  • Loading branch information
stevelinsell committed Dec 20, 2017
1 parent 81ed197 commit ffa758e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .tools/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ CC = cc
AM_CPPFLAGS = $(includes) $(include_enable_usdm) $(includes_driver) \
$(includes_enable_qat_mux)

CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
AM_CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
$(cflags_qat_contig_mem) $(cflags_enable_multi_thread) \
$(cflags_enable_usdm) $(cflags_mux) $(enable_qat_rsa) \
$(enable_qat_ciphers) $(enable_qat_ecdh) $(enable_qat_ecdsa) \
Expand Down
23 changes: 12 additions & 11 deletions .tools/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = cc
CCDEPMODE = @CCDEPMODE@
CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
$(cflags_qat_contig_mem) $(cflags_enable_multi_thread) \
$(cflags_enable_usdm) $(cflags_mux) $(enable_qat_rsa) \
$(enable_qat_ciphers) $(enable_qat_ecdh) $(enable_qat_ecdsa) \
$(enable_qat_dsa) $(enable_qat_dh) $(enable_qat_prf) \
$(enable_qat_small_pkt_offload) \
$(enable_qat_lenstra_protection) \
$(enable_qat_debug) $(enable_qat_warnings) \
$(enable_qat_mem_debug) $(enable_qat_mem_warnings) \
$(cflags_qat_debug_file)

CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
Expand Down Expand Up @@ -373,6 +363,17 @@ include_HEADERS = ${OPENSSL_COMMON_HDR} \
AM_CPPFLAGS = $(includes) $(include_enable_usdm) $(includes_driver) \
$(includes_enable_qat_mux)

AM_CFLAGS = $(cflags) $(cflags_cc_opt) $(cflags_enable_upstream_driver) \
$(cflags_qat_contig_mem) $(cflags_enable_multi_thread) \
$(cflags_enable_usdm) $(cflags_mux) $(enable_qat_rsa) \
$(enable_qat_ciphers) $(enable_qat_ecdh) $(enable_qat_ecdsa) \
$(enable_qat_dsa) $(enable_qat_dh) $(enable_qat_prf) \
$(enable_qat_small_pkt_offload) \
$(enable_qat_lenstra_protection) \
$(enable_qat_debug) $(enable_qat_warnings) \
$(enable_qat_mem_debug) $(enable_qat_mem_warnings) \
$(cflags_qat_debug_file)

libqat_la_LDFLAGS = $(QAT_SHARED_LIB_DEPS_LD) \
$(QAT_SHARED_LIB_DEPS_UPSTREAM_DRIVER) \
$(QAT_SHARED_LIB_DEPS_DRIVER) \
Expand Down

0 comments on commit ffa758e

Please sign in to comment.