Skip to content

Commit dc30c2a

Browse files
committed
general codebase cleanup
1 parent 79159cc commit dc30c2a

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

CMakeLists.txt

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
2-
# set(CMAKE_CXX_STANDARD 14)
3-
# set(CMAKE_CXX_STANDARD_REQUIRED ON)
4-
51
string(ASCII 27 Esc)
62
set(Purple "${Esc}[35m")
73
set(Green "${Esc}[32m")
84
set(Red "${Esc}[31m")
95
set(ColorReset "${Esc}[m")
106

117
function(alaska_switch OPT DEFAULT)
8+
if (${OPT})
9+
message(STATUS "${OPT} DEFINED")
10+
endif()
11+
12+
1213
set(${OPT} ${DEFAULT} CACHE BOOL "")
1314

1415
if(${OPT} MATCHES "ON|On|on|TRUE|true|1")
@@ -40,6 +41,11 @@ alaska_option(CMAKE_BUILD_TYPE Release)
4041
set(ALASKA_VERSION 2)
4142

4243

44+
set(CMAKE_C_COMPILER_WORKS 1)
45+
set(CMAKE_CXX_COMPILER_WORKS 1)
46+
47+
48+
4349
# -------------------------------------------------------------------------------------------
4450

4551
cmake_minimum_required(VERSION 3.13)

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $(BUILD)/Makefile:
2323
@cd $(BUILD) && cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=$(ROOT)/local
2424

2525
alaska: $(BUILD_REQ)
26-
@cd $(BUILD) && cmake --build . --target install --config Release
26+
@$(MAKE) -C $(BUILD) install
2727
@cp build/compile_commands.json .
2828

2929
sanity: alaska

runtime/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
2323

2424
# Do NOT link libc++ implicitly. This just makes it easier to port to new hardware or embedded environments
2525
list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_LIBRARIES stdc++)
26-
add_definitions(-D_GNU_SOURCE -D_REENTRANT)
26+
add_definitions(-D_REENTRANT)
2727

2828

2929

runtime/core/HandleTable.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <alaska/ThreadCache.hpp>
1515
#include <alaska/Logger.hpp>
1616
#include <alaska/HeapPage.hpp>
17-
#include "ck/lock.h"
17+
#include <ck/lock.h>
1818
#include <stdio.h>
1919
#include <sys/mman.h>
2020

0 commit comments

Comments
 (0)