Changeset bc56f30 in mainline for uspace/lib/posix/Makefile

Timestamp:

2019-05-27T12:38:26Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0d14c25

Parents:

4d51c60

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-13 16:06:49)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 12:38:26)

Message:

Make some libc and libposix headers usable in C++

These headers either get included from standard C++ headers,
or are standard themselves, which means any unnamespaced nonstandard
identifiers are a problem. This commit attempts to fix those
issues, and removes hacks previously used in libcpp to work around it.

File:

• uspace/lib/posix/Makefile (modified) (4 diffs)

uspace/lib/posix/Makefile

@@ -41 +41 @@
         ../hound/libhound.a \
         ../pcm/libpcm.a \
+        ../cpp/libcpp.a \
         $(LIBC_PREFIX)/libc.a \
         $(LIBC_PREFIX)/crt0.o \
@@ -96 +97 @@
         $(COMMON_CFLAGS)
 
+EXPORT_CXXFLAGS = \
+        $(COMMON_CXXFLAGS)
+
 include $(USPACE_PREFIX)/Makefile.common
 
@@ -109 +113 @@
         echo 'HELENOS_CPPFLAGS="$(EXPORT_CPPFLAGS)"' >> $@.new
         echo 'HELENOS_CFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
-        echo 'HELENOS_CXXFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
+        echo 'HELENOS_CXXFLAGS="$(EXPORT_CXXFLAGS)"' >> $@.new
         echo 'HELENOS_LDFLAGS="$(EXPORT_LDFLAGS)"' >> $@.new
         echo 'HELENOS_LDLIBS="$(EXPORT_LDLIBS)"' >> $@.new
@@ -146 +150 @@
         mkdir -p $(EXPORT_DIR)/include.new/libpcm
         cp -r -L -t $(EXPORT_DIR)/include.new/libpcm ../pcm/include/*
+        mkdir -p $(EXPORT_DIR)/include.new/libcpp
+        cp -r -L -t $(EXPORT_DIR)/include.new/libcpp ../cpp/include/*
         mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include