Changeset 9fb280c in mainline

Timestamp:

2019-07-19T15:57:15Z (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:

9fe2fd7

Parents:

a949f4a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-19 15:56:35)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-19 15:57:15)

Message:

Make clang slightly less broken

Files:

• tools/autotool.py (modified) (2 diffs)
• uspace/Makefile.common (modified) (2 diffs)

tools/autotool.py

@@ -306 +306 @@
 
         common['CLANG'] = "%sclang" % prefix
+        common['CLANGXX'] = "%sclang++" % prefix
 
         if (not path is None):
                 common['CLANG'] = "%s/%s" % (path, common['CLANG'])
+                common['CLANGXX'] = "%s/%s" % (path, common['CLANGXX'])
 
         check_app([common['CLANG'], "--version"], "clang", details)
@@ -625 +627 @@
                         check_common(common, "CLANG")
                         common['CC'] = common['CLANG']
+                        common['CXX'] = common['CLANGXX']
                         cc_autogen = common['CC'] + " -no-integrated-as"
 
                         if (config['INTEGRATED_AS'] == "yes"):
                                 common['CC'] += " -integrated-as"
+                                common['CXX'] += " -integrated-as"
 
                         if (config['INTEGRATED_AS'] == "no"):
                                 common['CC'] += " -no-integrated-as"
+                                common['CXX'] += " -no-integrated-as"
 
                 # Find full path to libgcc

uspace/Makefile.common

@@ -189 +189 @@
         -Wextra \
         -Wno-unused-parameter \
-        -Wmissing-prototypes \
         -Wwrite-strings \
         -Werror-implicit-function-declaration \
-        -Wsystem-headers \
         -Wunknown-pragmas \
         -Wa,--fatal-warnings
+
+ifneq ($(COMPILER),clang)
+        DEFAULT_CFLAGS += -Wmissing-prototypes -Wsystem-headers
+endif
 
 # XXX: -fno-builtin-strftime is for a seemingly spurious format warning.
@@ -239 +241 @@
         -fno-common \
         -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+
+ifeq ($(COMPILER),clang)
+        COMMON_CFLAGS += -ffreestanding -nostdlibinc -Wno-unused-command-line-argument
+endif
 
 # TODO: Use a different name.