Changeset ea42e44 in mainline

Timestamp:

2018-02-08T19:33:49Z (7 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:

8192d8a

Parents:

2660ee3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-07 18:23:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-08 19:33:49)

Message:

Third party build improvements.

Add HELENOS_ARCH, HELENOS_CXXFLAGS and HELENOS_LDLIBS variables,
split CPPFLAGS from CFLAGS, split LDLIBS from LDFLAGS.

Location:

uspace

Files:

• Makefile.common (modified) (2 diffs)
• lib/posix/Makefile (modified) (3 diffs)

uspace/Makefile.common

@@ -205 +205 @@
 
 # Flags that should always be used, even for third-party software.
+COMMON_CPPFLAGS = \
+        -nostdinc \
+        -D__$(ENDIANESS)__
+
 COMMON_CFLAGS = \
         -ffreestanding \
-        -nostdlib \
-        -nostdinc \
-        -D__$(ENDIANESS)__
+        -nostdlib
 
 # Flags that are always used for HelenOS code, but not for third-party.
@@ -224 +226 @@
 # TODO: Use a different name.
 # CFLAGS variable is traditionally used for overridable flags.
-CFLAGS = $(COMMON_CFLAGS) $(HELENOS_CFLAGS) $(DEFAULT_CFLAGS)
+CFLAGS = $(COMMON_CPPFLAGS) $(COMMON_CFLAGS) $(HELENOS_CFLAGS) $(DEFAULT_CFLAGS)
 
 ## Setup platform configuration

uspace/lib/posix/Makefile

@@ -103 +103 @@
 EXPORT_LDFLAGS = \
         -L$$(HELENOS_EXPORT_ROOT)/lib \
-        --whole-archive -lc -lmath --no-whole-archive \
         -T link.ld
 
+EXPORT_LDLIBS = \
+        -lmath -lc
+
 EXPORT_CFLAGS = \
-        $(EXPORT_CPPFLAGS) \
-        $(addprefix -Xlinker , $(EXPORT_LDFLAGS))
+        -specs $$(HELENOS_EXPORT_ROOT)/lib/gcc.specs
 
 include $(USPACE_PREFIX)/Makefile.common
@@ -116 +117 @@
         echo '+ $(COMMON_CFLAGS)' >> $@.new
         echo >> $@.new
+        echo '*cpp:' >> $@.new
+        echo '+ $(COMMON_CPPFLAGS)' >> $@.new
+        echo >> $@.new
         echo '*lib:' >> $@.new
-        echo '--whole-archive -lc -lmath --no-whole-archive' >> $@.new
-        echo >> $@.new
+        echo '$(EXPORT_LDLIBS)' >> $@.new
         mv $@.new $@
 
@@ -137 +140 @@
         echo '# Do not forget to set HELENOS_EXPORT_ROOT.' >> $@.new
         echo 'HELENOS_CROSS_PATH="$(shell dirname $(CC))"' >> $@.new
+        echo 'HELENOS_ARCH="$(firstword $(subst -, ,$(TARGET)))"' >> $@.new
         echo 'HELENOS_TARGET="$(TARGET)"' >> $@.new
         echo 'HELENOS_CPPFLAGS="$(EXPORT_CPPFLAGS)"' >> $@.new
         echo 'HELENOS_CFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
+        echo 'HELENOS_CXXFLAGS="$(EXPORT_CFLAGS)"' >> $@.new
         echo 'HELENOS_LDFLAGS="$(EXPORT_LDFLAGS)"' >> $@.new
+        echo 'HELENOS_LDLIBS="$(EXPORT_LDLIBS)"' >> $@.new
         mv $@.new $@