svn commit: r311835 - projects/clang400-import/lib/libc++
Dimitry Andric
dim at FreeBSD.org
Mon Jan 9 22:46:48 UTC 2017
Author: dim
Date: Mon Jan 9 22:46:47 2017
New Revision: 311835
URL: https://svnweb.freebsd.org/changeset/base/311835
Log:
Update the libc++ Makefile to be more like the other llvm and clang
Makefiles.
Modified:
projects/clang400-import/lib/libc++/Makefile
Modified: projects/clang400-import/lib/libc++/Makefile
==============================================================================
--- projects/clang400-import/lib/libc++/Makefile Mon Jan 9 22:41:53 2017 (r311834)
+++ projects/clang400-import/lib/libc++/Makefile Mon Jan 9 22:46:47 2017 (r311835)
@@ -3,9 +3,9 @@
.include <src.opts.mk>
PACKAGE= clibs
-_LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt
-HDRDIR= ${.CURDIR}/../../contrib/libc++/include
-SRCDIR= ${.CURDIR}/../../contrib/libc++/src
+_LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt
+HDRDIR= ${SRCTOP}/contrib/libc++/include
+SRCDIR= ${SRCTOP}/contrib/libc++/src
CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
.if ${MACHINE_CPUARCH} == "arm"
STATIC_CXXFLAGS+= -mlong-calls
@@ -17,43 +17,43 @@ LIB= c++
SHLIB_MAJOR= 1
SHLIB_LDSCRIPT= libc++.ldscript
-SRCS+= algorithm.cpp\
- any.cpp\
- bind.cpp\
- chrono.cpp\
- condition_variable.cpp\
- debug.cpp\
- exception.cpp\
- future.cpp\
- hash.cpp\
- ios.cpp\
- iostream.cpp\
- locale.cpp\
- memory.cpp\
- mutex.cpp\
- new.cpp\
- optional.cpp\
- random.cpp\
- regex.cpp\
- shared_mutex.cpp\
- stdexcept.cpp\
- string.cpp\
- strstream.cpp\
- system_error.cpp\
- thread.cpp\
- typeinfo.cpp\
- utility.cpp\
- valarray.cpp
-
-CXXRT_SRCS+= libelftc_dem_gnu3.c\
- terminate.cc\
- dynamic_cast.cc\
- memory.cc\
- auxhelper.cc\
- exception.cc\
- stdexcept.cc\
- typeinfo.cc\
- guard.cc
+SRCS+= algorithm.cpp
+SRCS+= any.cpp
+SRCS+= bind.cpp
+SRCS+= chrono.cpp
+SRCS+= condition_variable.cpp
+SRCS+= debug.cpp
+SRCS+= exception.cpp
+SRCS+= future.cpp
+SRCS+= hash.cpp
+SRCS+= ios.cpp
+SRCS+= iostream.cpp
+SRCS+= locale.cpp
+SRCS+= memory.cpp
+SRCS+= mutex.cpp
+SRCS+= new.cpp
+SRCS+= optional.cpp
+SRCS+= random.cpp
+SRCS+= regex.cpp
+SRCS+= shared_mutex.cpp
+SRCS+= stdexcept.cpp
+SRCS+= string.cpp
+SRCS+= strstream.cpp
+SRCS+= system_error.cpp
+SRCS+= thread.cpp
+SRCS+= typeinfo.cpp
+SRCS+= utility.cpp
+SRCS+= valarray.cpp
+
+CXXRT_SRCS+= auxhelper.cc
+CXXRT_SRCS+= dynamic_cast.cc
+CXXRT_SRCS+= exception.cc
+CXXRT_SRCS+= guard.cc
+CXXRT_SRCS+= libelftc_dem_gnu3.c
+CXXRT_SRCS+= memory.cc
+CXXRT_SRCS+= stdexcept.cc
+CXXRT_SRCS+= terminate.cc
+CXXRT_SRCS+= typeinfo.cc
.for _S in ${CXXRT_SRCS}
CLEANFILES+= cxxrt_${_S}
@@ -71,132 +71,133 @@ CXXFLAGS+= -std=c++11
LIBADD+= cxxrt
INCSGROUPS= STD EXP EXT
-STD_HEADERS= __bit_reference\
- __bsd_locale_defaults.h\
- __bsd_locale_fallbacks.h\
- __config\
- __debug\
- __functional_03\
- __functional_base\
- __functional_base_03\
- __hash_table\
- __libcpp_version\
- __locale\
- __mutex_base\
- __nullptr\
- __refstring\
- __split_buffer\
- __sso_allocator\
- __std_stream\
- __string\
- __threading_support\
- __tree\
- __tuple\
- __undef_min_max\
- algorithm\
- any\
- array\
- atomic\
- bitset\
- cassert\
- ccomplex\
- cctype\
- cerrno\
- cfenv\
- cfloat\
- chrono\
- cinttypes\
- ciso646\
- climits\
- clocale\
- cmath\
- codecvt\
- complex\
- complex.h\
- condition_variable\
- csetjmp\
- csignal\
- cstdarg\
- cstdbool\
- cstddef\
- cstdint\
- cstdio\
- cstdlib\
- cstring\
- ctgmath\
- ctime\
- ctype.h\
- cwchar\
- cwctype\
- deque\
- errno.h\
- exception\
- float.h\
- forward_list\
- fstream\
- functional\
- future\
- initializer_list\
- inttypes.h\
- iomanip\
- ios\
- iosfwd\
- iostream\
- istream\
- iterator\
- limits\
- limits.h\
- list\
- locale\
- locale.h\
- map\
- math.h\
- memory\
- mutex\
- new\
- numeric\
- optional\
- ostream\
- queue\
- random\
- ratio\
- regex\
- scoped_allocator\
- set\
- setjmp.h\
- shared_mutex\
- sstream\
- stack\
- stdbool.h\
- stddef.h\
- stdexcept\
- stdint.h\
- stdio.h\
- stdlib.h\
- streambuf\
- string\
- string.h\
- string_view\
- strstream\
- system_error\
- tgmath.h\
- thread\
- tuple\
- type_traits\
- typeindex\
- typeinfo\
- unordered_map\
- unordered_set\
- utility\
- valarray\
- variant\
- vector\
- wchar.h\
- wctype.h
-RT_HEADERS= cxxabi.h\
- unwind.h\
- unwind-arm.h\
- unwind-itanium.h
+STD_HEADERS+= __bit_reference
+STD_HEADERS+= __bsd_locale_defaults.h
+STD_HEADERS+= __bsd_locale_fallbacks.h
+STD_HEADERS+= __config
+STD_HEADERS+= __debug
+STD_HEADERS+= __functional_03
+STD_HEADERS+= __functional_base
+STD_HEADERS+= __functional_base_03
+STD_HEADERS+= __hash_table
+STD_HEADERS+= __libcpp_version
+STD_HEADERS+= __locale
+STD_HEADERS+= __mutex_base
+STD_HEADERS+= __nullptr
+STD_HEADERS+= __refstring
+STD_HEADERS+= __split_buffer
+STD_HEADERS+= __sso_allocator
+STD_HEADERS+= __std_stream
+STD_HEADERS+= __string
+STD_HEADERS+= __threading_support
+STD_HEADERS+= __tree
+STD_HEADERS+= __tuple
+STD_HEADERS+= __undef_min_max
+STD_HEADERS+= algorithm
+STD_HEADERS+= any
+STD_HEADERS+= array
+STD_HEADERS+= atomic
+STD_HEADERS+= bitset
+STD_HEADERS+= cassert
+STD_HEADERS+= ccomplex
+STD_HEADERS+= cctype
+STD_HEADERS+= cerrno
+STD_HEADERS+= cfenv
+STD_HEADERS+= cfloat
+STD_HEADERS+= chrono
+STD_HEADERS+= cinttypes
+STD_HEADERS+= ciso646
+STD_HEADERS+= climits
+STD_HEADERS+= clocale
+STD_HEADERS+= cmath
+STD_HEADERS+= codecvt
+STD_HEADERS+= complex
+STD_HEADERS+= complex.h
+STD_HEADERS+= condition_variable
+STD_HEADERS+= csetjmp
+STD_HEADERS+= csignal
+STD_HEADERS+= cstdarg
+STD_HEADERS+= cstdbool
+STD_HEADERS+= cstddef
+STD_HEADERS+= cstdint
+STD_HEADERS+= cstdio
+STD_HEADERS+= cstdlib
+STD_HEADERS+= cstring
+STD_HEADERS+= ctgmath
+STD_HEADERS+= ctime
+STD_HEADERS+= ctype.h
+STD_HEADERS+= cwchar
+STD_HEADERS+= cwctype
+STD_HEADERS+= deque
+STD_HEADERS+= errno.h
+STD_HEADERS+= exception
+STD_HEADERS+= float.h
+STD_HEADERS+= forward_list
+STD_HEADERS+= fstream
+STD_HEADERS+= functional
+STD_HEADERS+= future
+STD_HEADERS+= initializer_list
+STD_HEADERS+= inttypes.h
+STD_HEADERS+= iomanip
+STD_HEADERS+= ios
+STD_HEADERS+= iosfwd
+STD_HEADERS+= iostream
+STD_HEADERS+= istream
+STD_HEADERS+= iterator
+STD_HEADERS+= limits
+STD_HEADERS+= limits.h
+STD_HEADERS+= list
+STD_HEADERS+= locale
+STD_HEADERS+= locale.h
+STD_HEADERS+= map
+STD_HEADERS+= math.h
+STD_HEADERS+= memory
+STD_HEADERS+= mutex
+STD_HEADERS+= new
+STD_HEADERS+= numeric
+STD_HEADERS+= optional
+STD_HEADERS+= ostream
+STD_HEADERS+= queue
+STD_HEADERS+= random
+STD_HEADERS+= ratio
+STD_HEADERS+= regex
+STD_HEADERS+= scoped_allocator
+STD_HEADERS+= set
+STD_HEADERS+= setjmp.h
+STD_HEADERS+= shared_mutex
+STD_HEADERS+= sstream
+STD_HEADERS+= stack
+STD_HEADERS+= stdbool.h
+STD_HEADERS+= stddef.h
+STD_HEADERS+= stdexcept
+STD_HEADERS+= stdint.h
+STD_HEADERS+= stdio.h
+STD_HEADERS+= stdlib.h
+STD_HEADERS+= streambuf
+STD_HEADERS+= string
+STD_HEADERS+= string.h
+STD_HEADERS+= string_view
+STD_HEADERS+= strstream
+STD_HEADERS+= system_error
+STD_HEADERS+= tgmath.h
+STD_HEADERS+= thread
+STD_HEADERS+= tuple
+STD_HEADERS+= type_traits
+STD_HEADERS+= typeindex
+STD_HEADERS+= typeinfo
+STD_HEADERS+= unordered_map
+STD_HEADERS+= unordered_set
+STD_HEADERS+= utility
+STD_HEADERS+= valarray
+STD_HEADERS+= variant
+STD_HEADERS+= vector
+STD_HEADERS+= wchar.h
+STD_HEADERS+= wctype.h
+
+RT_HEADERS+= cxxabi.h
+RT_HEADERS+= unwind-arm.h
+RT_HEADERS+= unwind-itanium.h
+RT_HEADERS+= unwind.h
.for hdr in ${STD_HEADERS}
STD+= ${HDRDIR}/${hdr}
@@ -207,44 +208,44 @@ STD+= ${_LIBCXXRTDIR}/${hdr}
.endfor
STDDIR= ${CXXINCLUDEDIR}
-EXP_HEADERS= __config\
- __memory\
- algorithm\
- any\
- chrono\
- deque\
- dynarray\
- filesystem\
- forward_list\
- functional\
- iterator\
- list\
- map\
- memory_resource\
- numeric\
- optional\
- propagate_const\
- ratio\
- regex\
- set\
- string\
- string_view\
- system_error\
- tuple\
- type_traits\
- unordered_map\
- unordered_set\
- utility\
- vector
+EXP_HEADERS+= __config
+EXP_HEADERS+= __memory
+EXP_HEADERS+= algorithm
+EXP_HEADERS+= any
+EXP_HEADERS+= chrono
+EXP_HEADERS+= deque
+EXP_HEADERS+= dynarray
+EXP_HEADERS+= filesystem
+EXP_HEADERS+= forward_list
+EXP_HEADERS+= functional
+EXP_HEADERS+= iterator
+EXP_HEADERS+= list
+EXP_HEADERS+= map
+EXP_HEADERS+= memory_resource
+EXP_HEADERS+= numeric
+EXP_HEADERS+= optional
+EXP_HEADERS+= propagate_const
+EXP_HEADERS+= ratio
+EXP_HEADERS+= regex
+EXP_HEADERS+= set
+EXP_HEADERS+= string
+EXP_HEADERS+= string_view
+EXP_HEADERS+= system_error
+EXP_HEADERS+= tuple
+EXP_HEADERS+= type_traits
+EXP_HEADERS+= unordered_map
+EXP_HEADERS+= unordered_set
+EXP_HEADERS+= utility
+EXP_HEADERS+= vector
.for hdr in ${EXP_HEADERS}
EXP+= ${HDRDIR}/experimental/${hdr}
.endfor
EXPDIR= ${CXXINCLUDEDIR}/experimental
-EXT_HEADERS= __hash\
- hash_map\
- hash_set
+EXT_HEADERS+= __hash
+EXT_HEADERS+= hash_map
+EXT_HEADERS+= hash_set
.for hdr in ${EXT_HEADERS}
EXT+= ${HDRDIR}/ext/${hdr}
More information about the svn-src-projects
mailing list