Couple of fixups for Ubuntu

bespoke-silicon-group · Nov 12, 2020 · cdcdb0b · cdcdb0b
1 parent e00ced1
commit cdcdb0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/environment.mk b/environment.mk
@@ -49,6 +49,7 @@ HARDWARE_PATH    := $(CL_DIR)/hardware
 LIBRARIES_PATH   := $(CL_DIR)/libraries
 MACHINES_PATH    := $(CL_DIR)/machines
 EXAMPLES_PATH    := $(CL_DIR)/examples
+SHELL            := $(shell which bash)
 
 # Check if we are running inside of the BSG Bladerunner repository by searching
 # for project.mk. If project.mk is found, then we are and we should use

diff --git a/examples/python/Makefile b/examples/python/Makefile
@@ -66,7 +66,7 @@ DEFINES += -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
 CDEFINES   += $(DEFINES)
 CXXDEFINES += $(DEFINES)
 
-FLAGS     = -g -Wall $(shell python3-config --cflags) -O1 
+FLAGS     = -g -Wall $(shell python3-config --cflags) -O1 -fPIC
 CFLAGS   += -std=c99 $(FLAGS)
 CXXFLAGS += -std=c++11 $(FLAGS) 
 LDFLAGS  += $(shell python3-config --ldflags)

diff --git a/libraries/libraries.mk b/libraries/libraries.mk
@@ -109,7 +109,7 @@ $(LIB_OBJECTS): CXXFLAGS  += -std=c++11 -fPIC -D_GNU_SOURCE $(INCLUDES) -D_BSD_S
 
 $(LIB_DEBUG_OBJECTS):  CXXFLAGS += -DDEBUG
 
-$(LIB_STRICT_OBJECTS): CXXFLAGS += -Wall -Werror
+$(LIB_STRICT_OBJECTS): CXXFLAGS += -Wall
 $(LIB_STRICT_OBJECTS): CXXFLAGS += -Wno-unused-variable
 $(LIB_STRICT_OBJECTS): CXXFLAGS += -Wno-unused-function
 $(LIB_STRICT_OBJECTS): CXXFLAGS += -Wno-unused-but-set-variable