Disable ubsan for now, because it causes linker errors.

Eelis · Dec 27, 2017 · 5523cad · 5523cad
1 parent 27a05b2
commit 5523cad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/compile-config b/compile-config
@@ -1,4 +1,4 @@
 GCC="/usr/local/bin/g++"
 CLANG="/usr/local/bin/clang++"
-GCC_COMPILE_FLAGS="-finput-charset=UTF-8 -pedantic-errors -Wfatal-errors -Wall -Wextra -Wshadow -Wno-unused-but-set-variable -Wno-empty-body -Wno-missing-field-initializers -Wwrite-strings -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-unused-local-typedefs -Wno-non-virtual-dtor -Wno-variadic-macros -fno-diagnostics-show-option -fno-use-linker-plugin -fmessage-length=0 -ftemplate-depth-128 -fno-merge-constants -fno-nonansi-builtins -fno-gnu-keywords -fstrict-aliasing -fstack-protector-all -Winvalid-pch -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -Wno-deprecated -Winit-self -Wno-unused-value -fno-diagnostics-show-caret -fsanitize=undefined -fno-sanitize-recover=all -fdiagnostics-parseable-fixits -march=native -Wno-unused-function"
-CLANG_COMPILE_FLAGS="-stdlib=libc++ -finput-charset=UTF-8 -pedantic-errors -Wfatal-errors -Wall -Wextra -Wshadow -Wno-empty-body -Wno-missing-field-initializers -Wwrite-strings -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-non-virtual-dtor -Wno-variadic-macros -fno-diagnostics-show-option -fmessage-length=0 -ftemplate-depth-128 -fno-gnu-keywords -fstrict-aliasing -fstack-protector-all -Winvalid-pch -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -Wno-deprecated -Winit-self -fsanitize=undefined -fdiagnostics-parseable-fixits -Wno-unused-value -Wno-unused-function -Wno-unused-local-typedef"
+GCC_COMPILE_FLAGS="-finput-charset=UTF-8 -pedantic-errors -Wfatal-errors -Wall -Wextra -Wshadow -Wno-unused-but-set-variable -Wno-empty-body -Wno-missing-field-initializers -Wwrite-strings -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-unused-local-typedefs -Wno-non-virtual-dtor -Wno-variadic-macros -fno-diagnostics-show-option -fno-use-linker-plugin -fmessage-length=0 -ftemplate-depth-128 -fno-merge-constants -fno-nonansi-builtins -fno-gnu-keywords -fstrict-aliasing -fstack-protector-all -Winvalid-pch -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -Wno-deprecated -Winit-self -Wno-unused-value -fno-diagnostics-show-caret -fdiagnostics-parseable-fixits -march=native -Wno-unused-function"
+CLANG_COMPILE_FLAGS="-stdlib=libc++ -finput-charset=UTF-8 -pedantic-errors -Wfatal-errors -Wall -Wextra -Wshadow -Wno-empty-body -Wno-missing-field-initializers -Wwrite-strings -Wno-deprecated -Wno-unused-parameter -Wno-unused-variable -Wno-non-virtual-dtor -Wno-variadic-macros -fno-diagnostics-show-option -fmessage-length=0 -ftemplate-depth-128 -fno-gnu-keywords -fstrict-aliasing -fstack-protector-all -Winvalid-pch -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -Wno-deprecated -Winit-self -fdiagnostics-parseable-fixits -Wno-unused-value -Wno-unused-function -Wno-unused-local-typedef"
diff --git a/src/EvalCxx.hsc b/src/EvalCxx.hsc
@@ -232,10 +232,10 @@ evaluate cfg Request{..} extra_env = do
           , "-Wl,--rpath,/usr/local/" ++ (if clang then "lib" else "lib64")
           , "-Wl,--undefined,geordi_init"
           , "-rdynamic"
-          , "-lgeordi_prelude-" ++ stdDigits standard, "-lmcheck", "-lubsan", "-lstdc++fs", "-lpthread", "-save-temps", "-ldl"] ++
+          , "-lgeordi_prelude-" ++ stdDigits standard, "-lmcheck", "-lstdc++fs", "-lpthread", "-save-temps", "-ldl"] ++
           (if clang then clangLinkFlags else [])
       where
-        clangLinkFlags = ["-fsanitize=undefined", "-lc++"]
+        clangLinkFlags = ["-lc++"]
         compileFlags = ["-w" | no_warn] ++
           if clang
             then ["-I", "/geordi/src/prelude", "-include", "prelude-" ++ stdDigits standard ++ ".hpp"]