Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
266c16fe
Commit
266c16fe
authored
Mar 22, 2018
by
Michael Ott
Browse files
Get rid of CXX11FLAGS in Makefile
parent
70815de8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
266c16fe
...
...
@@ -151,11 +151,11 @@ $(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/.built: $(DCDBDEPSPATH)/boost_$(BOOST_V
echo
" using gcc : arm :
$(CROSS_COMPILE)
g++ ; "
>
$
(
@D
)
/tools/build/src/user-config.jam
;
\
fi
cd
$
(
@D
)
&&
./bootstrap.sh
--prefix
=
$(DCDBDEPLOYPATH)
--with-libraries
=
atomic,chrono,date_time,exception,filesystem,program_options,random,regex,system,thread,timer
&&
\
./b2
cxxflags
=
"
$(CXX11FLAGS)
"
stage
&&
touch
$
(
@
)
./b2 stage
&&
touch
$
(
@
)
$(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/.installed
:
$(DCDBDEPSPATH)/boost_$(BOOST_VERSION_U)/.built
cd
$
(
@D
)
&&
./b2
-j
$(MAKETHREADS)
cxxflags
=
"
$(CXX11FLAGS)
"
install
&&
touch
$
(
@
)
cd
$
(
@D
)
&&
./b2
-j
$(MAKETHREADS)
install
&&
touch
$
(
@
)
$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.built
:
$(DCDBDEPSPATH)/libuv-v$(LIBUV_VERSION)/.patched
@
echo
"Building libuv..."
...
...
@@ -178,7 +178,7 @@ $(DCDBDEPSPATH)/cpp-driver-$(CPPDRV_VERSION)/.built: $(DCDBDEPSPATH)/cpp-driver-
mkdir
-p
$(DCDBDEPSPATH)
/cpp-driver_build
cd
$(DCDBDEPSPATH)
/cpp-driver_build
&&
\
CC
=
$(FULL_CC)
CXX
=
$(FULL_CXX)
cmake
$(CMAKE_CROSS_FLAGS)
\
-DCMAKE_CXX_FLAGS
=
"
$(CXX11FLAGS)
-Wno-unused-command-line-argument
-L
$(DCDBDEPLOYPATH)
/lib "
\
-DCMAKE_CXX_FLAGS
=
"-L
$(DCDBDEPLOYPATH)
/lib "
\
-DOPENSSL_ROOT_DIR
=
$(DCDBDEPSPATH)
/openssl-
$(OPENSSL_VERSION)
\
-DLIBUV_ROOT_DIR
=
$(DCDBDEPSPATH)
/libuv-v
$(LIBUV_VERSION)
\
-DCASS_BUILD_EXAMPLES
=
NO
\
...
...
@@ -198,7 +198,7 @@ $(DCDBDEPSPATH)/cpp-netlib-$(CPPNET_VERSION)/.built: $(DCDBDEPSPATH)/cpp-netlib-
mkdir
-p
$(DCDBDEPSPATH)
/cpp-netlib_build
cd
$(DCDBDEPSPATH)
/cpp-netlib_build
&&
\
CC
=
$(FULL_CC)
CXX
=
$(FULL_CXX)
cmake
$(CMAKE_CROSS_FLAGS)
\
-DCMAKE_CXX_FLAGS
=
"
$(CXX11FLAGS)
-Wno-unused-command-line-argument
-L
$(DCDBDEPLOYPATH)
/lib "
\
-DCMAKE_CXX_FLAGS
=
"-L
$(DCDBDEPLOYPATH)
/lib "
\
-DCPP-NETLIB_ENABLE_HTTPS
=
off
\
-DCPP-NETLIB_BUILD_TESTS
=
OFF
\
-DCPP-NETLIB_BUILD_EXAMPLES
=
OFF
\
...
...
common.mk
View file @
266c16fe
...
...
@@ -29,8 +29,7 @@ CMAKE_CROSS_FLAGS = ""
AUTOCONF_CROSS_FLAGS
=
""
endif
CFLAGS
+=
-I
$(DCDBDEPLOYPATH)
/include
-O2
-g
CXX11FLAGS
=
--std
=
c++11
-Wno-c99-extensions
-Wno-missing-field-initializers
-DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
-Wno-unused-local-typedef
CFLAGS
+=
-I
$(DCDBDEPLOYPATH)
/include
-O2
-g
-DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
LDFLAGS
+=
-L
$(DCDBDEPLOYPATH)
/lib
-O2
-g
.PHONY
:
all info
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment